Fix legal info back button
Make it its own SettingsPreferenceFragment.
whitespace--
Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 37d9c9c..e1df499 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -57,12 +57,7 @@
private static final String FILENAME_PROC_VERSION = "/proc/version";
private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";
- private static final String KEY_CONTAINER = "container";
private static final String KEY_REGULATORY_INFO = "regulatory_info";
- private static final String KEY_TERMS = "terms";
- private static final String KEY_LICENSE = "license";
- private static final String KEY_COPYRIGHT = "copyright";
- private static final String KEY_WEBVIEW_LICENSE = "webview_license";
private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
@@ -145,19 +140,9 @@
* info.
*/
final Activity act = getActivity();
- // These are contained in the "container" preference group
- PreferenceGroup parentPreference = (PreferenceGroup) findPreference(KEY_CONTAINER);
- Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TERMS,
- Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
- Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_LICENSE,
- Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
- Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,
- Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
- Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE,
- Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
// These are contained by the root preference screen
- parentPreference = getPreferenceScreen();
+ PreferenceGroup parentPreference = getPreferenceScreen();
if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,
KEY_SYSTEM_UPDATE_SETTINGS,
@@ -450,18 +435,6 @@
if (TextUtils.isEmpty(getFeedbackReporterPackage(context))) {
keys.add(KEY_DEVICE_FEEDBACK);
}
- if (!checkIntentAction(context, "android.settings.TERMS")) {
- keys.add(KEY_TERMS);
- }
- if (!checkIntentAction(context, "android.settings.LICENSE")) {
- keys.add(KEY_LICENSE);
- }
- if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {
- keys.add(KEY_COPYRIGHT);
- }
- if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {
- keys.add(KEY_WEBVIEW_LICENSE);
- }
if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
keys.add(KEY_SYSTEM_UPDATE_SETTINGS);
}
@@ -475,25 +448,6 @@
private boolean isPropertyMissing(String property) {
return SystemProperties.get(property).equals("");
}
-
- private boolean checkIntentAction(Context context, String action) {
- final Intent intent = new Intent(action);
-
- // Find the activity that is in the system image
- final PackageManager pm = context.getPackageManager();
- final List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
- final int listSize = list.size();
-
- for (int i = 0; i < listSize; i++) {
- ResolveInfo resolveInfo = list.get(i);
- if ((resolveInfo.activityInfo.applicationInfo.flags &
- ApplicationInfo.FLAG_SYSTEM) != 0) {
- return true;
- }
- }
-
- return false;
- }
};
}
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index da2a340..a857642 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -26,6 +26,8 @@
// Declare new temporary categories here, starting after this value.
public static final int UNDECLARED = 100000;
+ public static final int ABOUT_LEGAL_SETTINGS = UNDECLARED + 1;
+
/**
* Declare the view of this category.
*
diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java
new file mode 100644
index 0000000..5a9bf0b
--- /dev/null
+++ b/src/com/android/settings/LegalSettings.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.preference.PreferenceGroup;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class LegalSettings extends SettingsPreferenceFragment implements Indexable {
+
+ private static final String KEY_TERMS = "terms";
+ private static final String KEY_LICENSE = "license";
+ private static final String KEY_COPYRIGHT = "copyright";
+ private static final String KEY_WEBVIEW_LICENSE = "webview_license";
+
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ addPreferencesFromResource(R.xml.about_legal);
+
+ final Activity act = getActivity();
+ // These are contained in the "container" preference group
+ PreferenceGroup parentPreference = getPreferenceScreen();
+ Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TERMS,
+ Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+ Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_LICENSE,
+ Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+ Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,
+ Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+ Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE,
+ Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+ }
+
+ @Override
+ protected int getMetricsCategory() {
+ return InstrumentedFragment.ABOUT_LEGAL_SETTINGS;
+ }
+
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ Context context, boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.about_legal;
+ return Arrays.asList(sir);
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final List<String> keys = new ArrayList<String>();
+ if (!checkIntentAction(context, "android.settings.TERMS")) {
+ keys.add(KEY_TERMS);
+ }
+ if (!checkIntentAction(context, "android.settings.LICENSE")) {
+ keys.add(KEY_LICENSE);
+ }
+ if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {
+ keys.add(KEY_COPYRIGHT);
+ }
+ if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {
+ keys.add(KEY_WEBVIEW_LICENSE);
+ }
+ return keys;
+ }
+
+ private boolean checkIntentAction(Context context, String action) {
+ final Intent intent = new Intent(action);
+
+ // Find the activity that is in the system image
+ final PackageManager pm = context.getPackageManager();
+ final List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
+ final int listSize = list.size();
+
+ for (int i = 0; i < listSize; i++) {
+ ResolveInfo resolveInfo = list.get(i);
+ if ((resolveInfo.activityInfo.applicationInfo.flags &
+ ApplicationInfo.FLAG_SYSTEM) != 0) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+ };
+
+}
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 5d987fa..6481aba 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,6 +23,7 @@
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.HomeSettings;
+import com.android.settings.LegalSettings;
import com.android.settings.PrivacySettings;
import com.android.settings.ScreenPinningSettings;
import com.android.settings.SecuritySettings;
@@ -172,6 +173,7 @@
// Device infos
sRankMap.put(DeviceInfoSettings.class.getName(), RANK_DEVICE_INFO);
+ sRankMap.put(LegalSettings.class.getName(), RANK_DEVICE_INFO);
sBaseRankMap.put("com.android.settings", 0);
}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 6a324ac..7cb0dd1 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -24,6 +24,7 @@
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.HomeSettings;
+import com.android.settings.LegalSettings;
import com.android.settings.PrivacySettings;
import com.android.settings.R;
import com.android.settings.ScreenPinningSettings;
@@ -296,6 +297,13 @@
DeviceInfoSettings.class.getName(),
R.drawable.ic_settings_about));
+ sResMap.put(LegalSettings.class.getName(),
+ new SearchIndexableResource(
+ Ranking.getRankForClassName(LegalSettings.class.getName()),
+ NO_DATA_RES_ID,
+ LegalSettings.class.getName(),
+ R.drawable.ic_settings_about));
+
sResMap.put(WifiCallingSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(WifiCallingSettings.class.getName()),