summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/xml/about_legal.xml60
-rw-r--r--res/xml/device_info_settings.xml66
-rw-r--r--src/com/android/settings/DeviceInfoSettings.java48
-rw-r--r--src/com/android/settings/InstrumentedFragment.java2
-rw-r--r--src/com/android/settings/LegalSettings.java114
-rw-r--r--src/com/android/settings/search/Ranking.java2
-rw-r--r--src/com/android/settings/search/SearchIndexableResources.java8
7 files changed, 200 insertions, 100 deletions
diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml
new file mode 100644
index 0000000..48e81f4
--- /dev/null
+++ b/res/xml/about_legal.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/legal_information">
+
+ <!-- Note: The titles given here probably won't be used. Instead, we programmatically
+ fill the title with the label of the activity with the corresponding action.
+ If there is not an activity for an action, the item will be removed from the
+ list. -->
+
+ <!-- Copyright information -->
+ <PreferenceScreen
+ android:key="copyright"
+ android:title="@string/copyright_title">
+ <intent android:action="android.settings.COPYRIGHT" />
+ </PreferenceScreen>
+
+ <!-- License information -->
+ <PreferenceScreen
+ android:key="license"
+ android:title="@string/license_title">
+ <intent android:action="android.settings.LICENSE" />
+ </PreferenceScreen>
+
+ <!-- Terms and conditions -->
+ <PreferenceScreen
+ android:key="terms"
+ android:title="@string/terms_title">
+ <intent android:action="android.settings.TERMS" />
+ </PreferenceScreen>
+
+ <!-- System WebView License information -->
+ <PreferenceScreen
+ android:key="webview_license"
+ android:title="@string/webview_license_title">
+ <intent android:action="android.settings.WEBVIEW_LICENSE" />
+ </PreferenceScreen>
+
+ <Preference
+ android:key="wallpaper_attributions"
+ android:title="@string/wallpaper_attributions"
+ android:summary="@string/wallpaper_attributions_values"
+ />
+
+</PreferenceScreen>
+
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 46992a4..c3a3d52 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -4,9 +4,9 @@
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.
@@ -19,7 +19,7 @@
<!-- System update settings - launches activity -->
<PreferenceScreen android:key="system_update_settings"
- android:title="@string/system_update_settings_list_item_title"
+ android:title="@string/system_update_settings_list_item_title"
android:summary="@string/system_update_settings_list_item_summary">
<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
</PreferenceScreen>
@@ -34,7 +34,7 @@
<!-- Device status - launches activity -->
<PreferenceScreen android:key="status_info"
- android:title="@string/device_status"
+ android:title="@string/device_status"
android:summary="@string/device_status_summary">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
@@ -44,48 +44,8 @@
<!-- Legal Information -->
<PreferenceScreen
android:key="container"
- android:title="@string/legal_information">
-
- <!-- Note: The titles given here probably won't be used. Instead, we programmatically
- fill the title with the label of the activity with the corresponding action.
- If there is not an activity for an action, the item will be removed from the
- list. -->
-
- <!-- Copyright information -->
- <PreferenceScreen
- android:key="copyright"
- android:title="@string/copyright_title">
- <intent android:action="android.settings.COPYRIGHT" />
- </PreferenceScreen>
-
- <!-- License information -->
- <PreferenceScreen
- android:key="license"
- android:title="@string/license_title">
- <intent android:action="android.settings.LICENSE" />
- </PreferenceScreen>
-
- <!-- Terms and conditions -->
- <PreferenceScreen
- android:key="terms"
- android:title="@string/terms_title">
- <intent android:action="android.settings.TERMS" />
- </PreferenceScreen>
-
- <!-- System WebView License information -->
- <PreferenceScreen
- android:key="webview_license"
- android:title="@string/webview_license_title">
- <intent android:action="android.settings.WEBVIEW_LICENSE" />
- </PreferenceScreen>
-
- <Preference
- android:key="wallpaper_attributions"
- android:title="@string/wallpaper_attributions"
- android:summary="@string/wallpaper_attributions_values"
- />
-
- </PreferenceScreen>
+ android:title="@string/legal_information"
+ android:fragment="com.android.settings.LegalSettings" />
<PreferenceScreen
android:key="regulatory_info"
@@ -99,13 +59,13 @@
</PreferenceScreen>
<!-- Device hardware model -->
- <Preference android:key="device_model"
+ <Preference android:key="device_model"
style="?android:preferenceInformationStyle"
android:title="@string/model_number"
android:summary="@string/device_info_default"/>
-
+
<!-- Device firmware version -->
- <Preference android:key="firmware_version"
+ <Preference android:key="firmware_version"
style="?android:preferenceInformationStyle"
android:title="@string/firmware_version"
android:summary="@string/device_info_default"/>
@@ -117,19 +77,19 @@
android:summary="@string/device_info_default"/>
<!-- Device Baseband version -->
- <Preference android:key="baseband_version"
+ <Preference android:key="baseband_version"
style="?android:preferenceInformationStyle"
android:title="@string/baseband_version"
android:summary="@string/device_info_default"/>
-
+
<!-- Device Kernel version -->
- <Preference android:key="kernel_version"
+ <Preference android:key="kernel_version"
style="?android:preferenceInformationStyle"
android:title="@string/kernel_version"
android:summary="@string/device_info_default"/>
<!-- Detailed build version -->
- <Preference android:key="build_number"
+ <Preference android:key="build_number"
style="?android:preferenceInformationStyle"
android:title="@string/build_number"
android:summary="@string/device_info_default"/>
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 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
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 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
* 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 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
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 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
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 @@ public abstract class InstrumentedFragment extends PreferenceFragment {
// 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.DevelopmentSettings;
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 @@ public final class Ranking {
// 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.DevelopmentSettings;
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 @@ public final class SearchIndexableResources {
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()),
generated by cgit v1.1 at 2024-09-09 08:40:17 +0000