Commit 9ace05b1 by Lee Jaebin

ソース分離(未使用リソース削除)

parent 5d5eddef
...@@ -578,8 +578,6 @@ ...@@ -578,8 +578,6 @@
<string name="content_downloading">コンテンツダウンロード中です</string> <string name="content_downloading">コンテンツダウンロード中です</string>
<string name="display_preparing">表示準備中です</string> <string name="display_preparing">表示準備中です</string>
<string name="no_content">コンテンツが存在しません</string> <string name="no_content">コンテンツが存在しません</string>
<string name="signage_sync">サイネージ連動設定</string>
<string name="signage_sync_summary">サイネージ連動の設定をします</string>
<string name="is_parent">マスタモード</string> <string name="is_parent">マスタモード</string>
<string name="port_number">ポート番号</string> <string name="port_number">ポート番号</string>
<string name="parent_device">マスタ・デバイス</string> <string name="parent_device">マスタ・デバイス</string>
...@@ -595,7 +593,6 @@ ...@@ -595,7 +593,6 @@
<string name="receive_msg_failed">メッセージの受信に失敗しました。ポート番号を変更して再度実行してください。</string> <string name="receive_msg_failed">メッセージの受信に失敗しました。ポート番号を変更して再度実行してください。</string>
<string name="msg_master_select">以下のリストからマスタを選択してください。リストに対象マスタが表示されない場合、マスタの起動を確認の上、このダイアローグを閉じて、停止・開始を実行してください。</string> <string name="msg_master_select">以下のリストからマスタを選択してください。リストに対象マスタが表示されない場合、マスタの起動を確認の上、このダイアローグを閉じて、停止・開始を実行してください。</string>
<string name="waiting_master_info">マスタからの通知待ち</string> <string name="waiting_master_info">マスタからの通知待ち</string>
<string name="cannot_show_ext_monitor">お使いのAndroid端末は、バージョン4.2.2未満であるため、外部出力はできません。待受画面のみ表示します。</string>
<string name="init_admin_mode">起動時管理者画面表示設定</string> <string name="init_admin_mode">起動時管理者画面表示設定</string>
<string name="init_admin_mode_summary">端末の起動時管理者画面を表示します。</string> <string name="init_admin_mode_summary">端末の起動時管理者画面を表示します。</string>
<string name="pdf_image_size">外部モニタ解像度設定</string> <string name="pdf_image_size">外部モニタ解像度設定</string>
......
...@@ -578,8 +578,6 @@ ...@@ -578,8 +578,6 @@
<string name="content_downloading">해당 콘텐츠 다운로드 중입니다.</string> <string name="content_downloading">해당 콘텐츠 다운로드 중입니다.</string>
<string name="display_preparing">잠시만 기다려주세요. 준비중입니다.</string> <string name="display_preparing">잠시만 기다려주세요. 준비중입니다.</string>
<string name="no_content">해당 콘텐츠가 없습니다.</string> <string name="no_content">해당 콘텐츠가 없습니다.</string>
<string name="signage_sync">사이니지 연동 설정</string>
<string name="signage_sync_summary">사이니지 연동 설정 합니다.</string>
<string name="is_parent">마스터 모드</string> <string name="is_parent">마스터 모드</string>
<string name="port_number">포트 번호</string> <string name="port_number">포트 번호</string>
<string name="parent_device">마스터・디바이스</string> <string name="parent_device">마스터・디바이스</string>
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:onClick="onClickSearch"
android:text="@string/search" /> android:text="@string/search" />
</LinearLayout> </LinearLayout>
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_weight="0.8"
android:layout_toRightOf="@+id/row_icon"
android:paddingLeft="6dip" android:paddingLeft="6dip"
android:text="@string/remote_support" android:text="@string/remote_support"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
...@@ -134,7 +133,6 @@ ...@@ -134,7 +133,6 @@
android:id="@+id/item2_text" android:id="@+id/item2_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/row_icon"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:paddingLeft="6dip" android:paddingLeft="6dip"
android:layout_weight="0.8" android:layout_weight="0.8"
......
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<FrameLayout
android:id="@+id/fl_inner"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioGroup
android:id="@+id/viewmode_segment_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal" >
<RadioButton
android:id="@+id/view_mode_thumb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/radio_thumb"
android:button="@null"
android:checked="true"
android:gravity="center"
android:textSize="@dimen/app_small_text_size" />
<RadioButton
android:id="@+id/view_mode_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/radio_panel"
android:button="@null"
android:gravity="center"
android:textSize="@dimen/app_small_text_size" />
<RadioButton
android:id="@+id/view_mode_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/radio_list"
android:button="@null"
android:gravity="center"
android:textSize="@dimen/app_small_text_size" />
</RadioGroup>
<TextView
android:id="@+id/content_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="10dp"
android:textColor="@color/text_color"
android:textSize="15sp"
android:background="@drawable/icon_badge"
android:gravity="center"
android:text="@string/dummy_num"
android:visibility="gone"/>
</FrameLayout>
</merge>
\ No newline at end of file
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
android:id="@+id/project_name" android:id="@+id/project_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/row_icon"
android:minHeight="10dp" android:minHeight="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingLeft="6dip" android:paddingLeft="6dip"
......
...@@ -179,12 +179,6 @@ public class ABVUncaughtExceptionHandler implements UncaughtExceptionHandler { ...@@ -179,12 +179,6 @@ public class ABVUncaughtExceptionHandler implements UncaughtExceptionHandler {
if (!bugFile.exists()) { //バグレポートがなければ以降の処理を行わない if (!bugFile.exists()) { //バグレポートがなければ以降の処理を行わない
return; return;
} }
// 設定で送信ONになっていない場合はファイルを削除する。⇒しない。Exportに含めるように変更。
if (!PreferenceUtil.get(act, DefPrefKey.ERROR_SEND_ENABLE, false)) {
// bugFile.delete();
return;
}
//AlertDialogを表示 //AlertDialogを表示
ABookAlertDialog alert = AlertDialogUtil.createAlertDialog(act, R.string.bug_report); ABookAlertDialog alert = AlertDialogUtil.createAlertDialog(act, R.string.bug_report);
......
...@@ -65,11 +65,6 @@ public class ABVUIDataCache { ...@@ -65,11 +65,6 @@ public class ABVUIDataCache {
return lastUpdateTime; return lastUpdateTime;
} }
public void setSelectedHomeMenu(int selectedHomeMenuType) {
mSelectedHomeMenuType = selectedHomeMenuType;
PreferenceUtil.putUserPref(context, UserPrefKey.SELECTED_HOME_MENU, selectedHomeMenuType);
}
public void clear() { public void clear() {
Logger.i(TAG, "clear all data"); Logger.i(TAG, "clear all data");
init(); init();
......
...@@ -22,7 +22,6 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity { ...@@ -22,7 +22,6 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
String data = getIntent().getExtras().getString(PushMessageKey.data); String data = getIntent().getExtras().getString(PushMessageKey.data);
if (StringUtil.isNullOrEmpty(data)) { if (StringUtil.isNullOrEmpty(data)) {
final String shareKey = getIntent().getExtras().getString(PushMessageKey.shareKey);
final long projectId = StringUtil.isNullOrEmpty(getIntent().getExtras().getString(PushMessageKey.projectId)) ? 0 : Long.parseLong(getIntent().getExtras().getString(PushMessageKey.projectId)); final long projectId = StringUtil.isNullOrEmpty(getIntent().getExtras().getString(PushMessageKey.projectId)) ? 0 : Long.parseLong(getIntent().getExtras().getString(PushMessageKey.projectId));
if (projectId > 0) { if (projectId > 0) {
...@@ -72,7 +71,7 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity { ...@@ -72,7 +71,7 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
}); });
alertDialog.show(); alertDialog.show();
} else if (StringUtil.isNullOrEmpty(shareKey)) { } else {
final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this, getRString(R.string.app_name), getIntent().getExtras().getString(PushMessageKey.message)); final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this, getRString(R.string.app_name), getIntent().getExtras().getString(PushMessageKey.message));
alertDialog.setPositiveButton(R.string.ok, null); alertDialog.setPositiveButton(R.string.ok, null);
alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
......
...@@ -3,65 +3,17 @@ package jp.agentec.abook.abv.ui.common.appinfo; ...@@ -3,65 +3,17 @@ package jp.agentec.abook.abv.ui.common.appinfo;
public interface AppDefType { public interface AppDefType {
String APP_PACKAGE = "jp.agentec.abook.abv.launcher.android"; String APP_PACKAGE = "jp.agentec.abook.abv.launcher.android";
interface ViewMode{
int THUMB = 1;
int PANEL = 2;
int LIST = 3;
}
interface PrefName { interface PrefName {
String USER_PREFERENCE = "user_info"; String USER_PREFERENCE = "user_info";
String FCM_PREFERENCE = "gcm_info";
String DASHBOARDWIDGET = "dashboardwidget";
String DASHBOARD = "dashboard";
String SPAREBOARD= "spareboard";
String AUTODOWNLOAD_INFO = "autodownload_info";
String GPS_SEND_TIME = "gps_send_time";
} }
interface DefPrefKey { interface DefPrefKey {
String REPEATABLE_PLAY = "repeatablePlay"; String REPEATABLE_PLAY = "repeatablePlay";
String FIX_ORIENTATION = "fixOrientation";
String WIFI_ALERT_ENABLE = "wifiAlertEnable"; String WIFI_ALERT_ENABLE = "wifiAlertEnable";
String PERMISSION_ACCESS_LOCATION = "permissionAccessLocation"; String PERMISSION_ACCESS_LOCATION = "permissionAccessLocation";
String PUSH_MESSAGE ="pushMessage";
String CURSOR_ENABLE = "cursorEnable"; String CURSOR_ENABLE = "cursorEnable";
String IMAGE_CHANGE_EFFECT = "imageChangeEffect";
String ERROR_SEND_ENABLE = "errorSendEnable";
String LOG_SEND_ENABLE = "logSendEnable";
String TAP_ACTION_ON_UPDATE ="tapActionOnUpdate";
String TAP_ACTION_ON_DELIVERY_SELECT = "tapActionOnDeliverySelect";
String DISPLAY_MARKING = "displayMarking"; String DISPLAY_MARKING = "displayMarking";
String INIT_ADMIN_MODE = "initAdminMode";
String SAVE_GPS_SENDED_TIME = "saveTime";
String APP_VERSIONUP_PROCESSING = "appVersionProcessingFlag"; String APP_VERSIONUP_PROCESSING = "appVersionProcessingFlag";
String GPS_LATITUDE = "lat";
String GPS_LONGITUDE = "lon";
}
interface SignagePrefKey {
String LAST_CHECK_SCHEDULE_DATE = "lastCheckScheduleDate";
String LAST_UPDATE_NEW_CONTENT_DATE = "lastUpdateNewContentDate";
}
interface WidgetPrefKey {
String SETTING_WIDGET_ID = "settingWidgetId";
String AUTO_UPDATE = "autoUpdate";
String widgetListId = "widgetListId";
String widgetListName = "widgetListName";
String widgetListItem = "widgetListItem";
}
interface DashboardPrefKey {
String TOTAL = "total";
String BOARD_LIST_ITEM = "boardListItem";
String BOARD_LIST_NAME = "boardListName";
String BOARD_LIST_ID = "boardListId";
}
interface FcmPrefKey {
String PROPERTY_REG_ID = "registration_id";
String PROPERTY_CMS_SEND_RESULT = "send_result";
} }
interface UserPrefKey { interface UserPrefKey {
...@@ -70,43 +22,16 @@ public interface AppDefType { ...@@ -70,43 +22,16 @@ public interface AppDefType {
String LEAVE_APP = "leaveApp"; String LEAVE_APP = "leaveApp";
String LAST_UPDATE_TIME = "lastUpdateTime"; String LAST_UPDATE_TIME = "lastUpdateTime";
String DEVICE_UUID = "deviceUuid"; String DEVICE_UUID = "deviceUuid";
String DOWNLOADED_DEFAULT_CONTENT = "downloadedDefaultContent";
String AGREE_MACINFO = "agreeMacInfo"; String AGREE_MACINFO = "agreeMacInfo";
String AGREE_GMAIL_ACCOUNT_SEND = "agreeGmailAccountSend";
String SHOWED_PERMISSION_ACCESS_LOCATION_ALERT = "showedPermissionAccessLocationAlert"; String SHOWED_PERMISSION_ACCESS_LOCATION_ALERT = "showedPermissionAccessLocationAlert";
String CONTENT_LOCATION_TYPE_ENABLE = "contentLocationTypeEnable";
String ALL_SUBSCRIPTION_PRODUCT_ID = "allSubscriptionProductId";
String HOME_SITE_ID = "homeSiteId";
String HOME_CONTRACT_ID = "homeContractId";
String LAST_MASTER_TRANSFER_TIME = "lastMasterTransferTime";
String FILTER_FAVORITE = "favoriteFlag";
String FILTER_UPDATE = "updateFlag";
String VIEW_MODE = "viewMode";
String CONTENT_LOCATION_TYPE = "contentLocationType";
String CONTENT_TYPES = "contentTypes";
String CONTENT_TYPES_FOR_MY_DATA = "contentTypesForMyData";
String SORT_CONDITION_DEVICE = "sortConditionDevice";
String SORT_CONDITION_CLOUD = "sortConditionCloud";
String SORT_CONDITION_ALL = "sortConditionAll";
String SELECTED_HOME_MENU = "selectedHomeMenu";
String MY_DATA_SUBMENU = "myDataSubmenu";
String MEETING_ENTERED_TIME = "meetingEnteredTime"; String MEETING_ENTERED_TIME = "meetingEnteredTime";
String MEETING_ENTERED_FLG = "meetingEnteredFlg"; String MEETING_ENTERED_FLG = "meetingEnteredFlg";
String MEETING_PASSWORD = "meetingPassword"; String MEETING_PASSWORD = "meetingPassword";
String MEETING_ID = "meetingId"; String MEETING_ID = "meetingId";
String SKEY = "skey"; String SKEY = "skey";
String ADMIN_MODE = "adminMode";
String SIGNAGE_SYNC_IS_STARTED = "signageSyncIsStarted";
String SIGNAGE_SYNC_IS_PARENT = "signageSyncIsParent";
String SIGNAGE_SYNC_LISTEN_PORT = "signageSyncListenPort";
String SIGNAGE_SYNC_CHILD_LIST = "signageSyncChildList";
String SIGNAGE_SYNC_PARENT_INFO = "signageSyncParentInfo";
String PDF_IMAGE_SIZE = "pdfImageSize"; String PDF_IMAGE_SIZE = "pdfImageSize";
String SIGNAGE_HEIGHT = "sh"; String SIGNAGE_HEIGHT = "sh";
String SIGNAGE_WIDTH = "sw"; String SIGNAGE_WIDTH = "sw";
...@@ -197,15 +122,9 @@ public interface AppDefType { ...@@ -197,15 +122,9 @@ public interface AppDefType {
interface PushMessageKey { interface PushMessageKey {
String message = "message"; String message = "message";
String shareKey = "shareKey";
String data = "data"; String data = "data";
String projectId = "projectId"; String projectId = "projectId";
} }
interface PushMessageReceivedScreen {
int HomeScreen = 0;
int ContentView = 1;
}
interface UrlPattern { interface UrlPattern {
String smart360 = "smart360"; String smart360 = "smart360";
......
...@@ -78,7 +78,6 @@ public class ABookSettingFragment extends PreferenceFragment { ...@@ -78,7 +78,6 @@ public class ABookSettingFragment extends PreferenceFragment {
// ログ情報 // ログ情報
private static final String EXPORT = "export"; private static final String EXPORT = "export";
private static final String ERROR_SEND_ENABLE = "errorSendEnable";
// アプリ情報 // アプリ情報
private static final String LICENSE_INFO = "licenseInfo"; private static final String LICENSE_INFO = "licenseInfo";
......
package jp.agentec.abook.abv.ui.home.library;
import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.ViewMode;
import android.content.Context;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.RadioGroup;
import android.widget.TextView;
public class HeaderLayout extends FrameLayout {
private FrameLayout mInnerLayout;
public HeaderLayout(Context context) {
super(context);
init(context);
}
public HeaderLayout(Context context, AttributeSet attributeSet) {
super(context, attributeSet);
init(context);
}
private void init(Context context) {
Logger.d("HeaderLayout", "init");
LayoutInflater.from(context).inflate(R.layout.hidden_menu_header, this);
mInnerLayout = (FrameLayout) findViewById(R.id.fl_inner);
if (mInnerLayout != null) {
} else {
new Exception("mInnerLayout is null");
}
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mInnerLayout.getLayoutParams();
lp.gravity = Gravity.BOTTOM;
}
public void checkedViewMode(int viewMode) {
RadioGroup rg = (RadioGroup) findViewById(R.id.viewmode_segment_group);
switch(viewMode) {
case ViewMode.THUMB:
rg.check(R.id.view_mode_thumb);
break;
case ViewMode.PANEL:
rg.check(R.id.view_mode_panel);
break;
case ViewMode.LIST:
rg.check(R.id.view_mode_list);
break;
}
}
public void setViewModeGroupVisibility(int visibility) {
findViewById(R.id.viewmode_segment_group).setVisibility(visibility);
}
public void setContentCount(int count) {
TextView countText = (TextView) findViewById(R.id.content_count);
countText.setVisibility(View.VISIBLE);
countText.setText(count + "");
}
public void setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener l) {
RadioGroup rg = (RadioGroup) findViewById(R.id.viewmode_segment_group);
if (rg != null) {
rg.clearCheck();
rg.setOnCheckedChangeListener(l);
}
}
public final void setHeight(int height) {
Logger.d("HeaderLayout", "height=" + height);
ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) getLayoutParams();
lp.height = height;
requestLayout();
}
public final void hideAllViews() {
// if (View.VISIBLE == mHeaderText.getVisibility()) {
// mHeaderText.setVisibility(View.INVISIBLE);
// }
}
public final void reset() {
}
public final void releaseToRefresh() {
// Now call the callback
releaseToRefreshImpl();
}
protected void releaseToRefreshImpl() {
// mHeaderImage.startAnimation(mRotateAnimation);
}
// public final void refreshing() {
// // Now call the callback
// refreshingImpl();
// }
//
// protected void refreshingImpl() {
//// mHeaderImage.clearAnimation();
//// mHeaderImage.setVisibility(View.INVISIBLE);
//// mHeaderProgress.setVisibility(View.VISIBLE);
// }
public final int getContentSize() {
return mInnerLayout.getHeight();
}
public final void onPull(float scaleOfLayout) {
onPullImpl(scaleOfLayout);
}
protected void onPullImpl(float scaleOfLayout) {
}
public final void showInvisibleViews() {
// if (View.INVISIBLE == mHeaderText.getVisibility()) {
// mHeaderText.setVisibility(View.VISIBLE);
// }
}
}
package jp.agentec.abook.abv.ui.home.library;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.GridView;
/**
* Created by changgyun on 2018/09/13.
*/
public class NonScrollableGridView extends GridView {
public NonScrollableGridView(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// Do not use the highest two bits of Integer.MAX_VALUE because they are
// reserved for the MeasureSpec mode
int heightSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
super.onMeasure(widthMeasureSpec, heightSpec);
getLayoutParams().height = getMeasuredHeight();
}
}
package jp.agentec.abook.abv.ui.home.library;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.GridView;
public class PullToShowMenuGridView extends PullToShowMenuBase<GridView> {
public PullToShowMenuGridView(Context context) {
super(context);
}
public PullToShowMenuGridView(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
protected GridView createRefreshableView(Context context, AttributeSet attrs) {
return new HeaderGridView(context);
}
}
package jp.agentec.abook.abv.ui.home.library;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ListView;
public class PullToShowMenuListView extends PullToShowMenuBase<ListView> {
// private HeaderLayout mHeaderLoadingView;
public PullToShowMenuListView(Context context) {
super(context);
}
public PullToShowMenuListView(Context context, AttributeSet attrs) {
super(context, attrs);
}
protected void setUIData(Context context) {
// final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
// FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL);
//
// FrameLayout frame = new FrameLayout(getContext());
// mHeaderLoadingView = new HeaderLayout(context);
// mHeaderLoadingView.setVisibility(View.GONE);
// frame.addView(mHeaderLoadingView, lp);
// mPullableView.addHeaderView(frame, null, false);
}
@Override
protected ListView createRefreshableView(Context context, AttributeSet attrs) {
return new ListView(context);
}
//
// @Override
// protected void onRefreshing(final boolean doScroll) {
// /**
// * If we're not showing the Refreshing view, or the list is empty, the
// * the header/footer views won't show so we use the normal method.
// */
// ListAdapter adapter = mPullableView.getAdapter();
// if (adapter == null || adapter.isEmpty()) {
// super.onRefreshing(doScroll);
// return;
// }
//
// super.onRefreshing(false);
//
// int scrollToY = getScrollY() + getHeaderSize();
//
// mHeaderLoadingView.setVisibility(View.VISIBLE);
//
// if (doScroll) {
// // We need to disable the automatic visibility changes for now
// disableLoadingLayoutVisibilityChanges();
//
// // We scroll slightly so that the ListView's header/footer is at the
// // same Y position as our normal header/footer
// setHeaderScroll(scrollToY);
//
// mPullableView.setSelection(0);
//
// smoothScrollTo(0);
// }
// }
//
// @Override
// protected void onReset() {
// final int scrollToHeight, selection;
// final boolean scrollLvToEdge;
//
// scrollToHeight = -getHeaderSize();
// selection = 0;
// scrollLvToEdge = Math.abs(mPullableView.getFirstVisiblePosition() - selection) <= 1;
//
// if (mHeaderLoadingView.getVisibility() == View.VISIBLE) {
// mHeaderLayout.showInvisibleViews();
// mHeaderLoadingView.setVisibility(View.GONE);
// /**
// * Scroll so the View is at the same Y as the ListView
// * header/footer, but only scroll if: we've pulled to refresh, it's
// * positioned correctly
// */
// if (scrollLvToEdge) {
// mPullableView.setSelection(selection);
// setHeaderScroll(scrollToHeight);
// }
//
// }
//
// // Finally, call up to super
// super.onReset();
// }
}
...@@ -2632,6 +2632,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -2632,6 +2632,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
try { try {
if (ActivityHandlingHelper.getInstance().checkContent(linkContentId, (int) actionInfoJSON.getPageNo())) { // コンテンツをチェックし、なければDL後開く if (ActivityHandlingHelper.getInstance().checkContent(linkContentId, (int) actionInfoJSON.getPageNo())) { // コンテンツをチェックし、なければDL後開く
getABVUIDataCache().setReturnContentIdList(linkContentId, (int) actionInfoJSON.getPageNo());
if (isLinkedContent) { if (isLinkedContent) {
ActivityHandlingHelper.getInstance().startContentActivityForLinkedConent(mProjectId, linkContentId, (int) actionInfoJSON.getPageNo()); ActivityHandlingHelper.getInstance().startContentActivityForLinkedConent(mProjectId, linkContentId, (int) actionInfoJSON.getPageNo());
} else { } else {
......
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.gms"
android:versionCode="4242030"
android:versionName="4.2.42 (1018832-030)" >
<uses-sdk android:minSdkVersion="9"/>
</manifest>
Library Project including Google Play services client jar.
This can be used by an Android project to use the API's provided
by Google Play services.
There is technically no source, but the src folder is necessary
to ensure that the build system works. The content is actually
located in the libs/ directory.
USAGE:
Make sure you import this Android library project into your IDE
and set this project as a dependency.
Note that if you use proguard, you will want to include the
options from proguard.txt in your configuration.
\ No newline at end of file
-keep class * extends java.util.ListResourceBundle {
protected Object[][] getContents();
}
# Keep SafeParcelable value, needed for reflection. This is required to support backwards
# compatibility of some classes.
-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
public static final *** NULL;
}
# Keep the names of classes/members we need for client functionality.
-keepnames @com.google.android.gms.common.annotation.KeepName class *
-keepclassmembernames class * {
@com.google.android.gms.common.annotation.KeepName *;
}
# Needed for Parcelable/SafeParcelable Creators to not get stripped
-keepnames class * implements android.os.Parcelable {
public static final ** CREATOR;
}
\ No newline at end of file
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library=true
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:color="@color/common_signin_btn_dark_text_pressed" />
<item
android:state_enabled="false"
android:state_focused="true"
android:color="@color/common_signin_btn_dark_text_disabled" />
<item
android:state_focused="true"
android:color="@color/common_signin_btn_dark_text_focused" />
<item
android:state_enabled="false"
android:color="@color/common_signin_btn_dark_text_disabled" />
<item
android:color="@color/common_signin_btn_dark_text_default" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:color="@color/common_signin_btn_light_text_pressed" />
<item
android:state_enabled="false"
android:state_focused="true"
android:color="@color/common_signin_btn_light_text_disabled" />
<item
android:state_focused="true"
android:color="@color/common_signin_btn_light_text_focused" />
<item
android:state_enabled="false"
android:color="@color/common_signin_btn_light_text_disabled" />
<item
android:color="@color/common_signin_btn_light_text_default" />
</selector>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment