Commit: c2b9a8bd43febe86fa026667dbaf8d3a7ee422ee - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: c2b9a8bd43febe86fa026667dbaf8d3a7ee422ee (tree)
• Time: 2016-10-13 01:48:55
• Author: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Change Summary

• modified: AndroidManifest.xml
• modified: res/values-zh-rCN/strings.xml
• modified: res/values/cm_strings.xml
• modified: res/values/customize.xml
• modified: res/values/strings.xml
• modified: res/xml/advanced_apps.xml
• modified: res/xml/display_settings.xml
• modified: res/xml/power_usage_summary.xml
• modified: res/xml/security_settings_password_sub.xml
• modified: res/xml/security_settings_pattern_sub.xml
• modified: res/xml/security_settings_pin_sub.xml
• modified: res/xml/security_settings_slide_sub.xml
• modified: src/com/android/settings/applications/AppOpsDetails.java
• modified: src/com/android/settings/applications/InstalledAppDetails.java
• modified: src/com/android/settings/fuelgauge/PowerUsageSummary.java
• modified: src/com/android/settings/search/Index.java

Incremental Difference

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,7 +81,10 @@
     <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
+
     <uses-permission android:name="cyanogenmod.permission.PROTECTED_APP" />
+    <uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="cyanogenmod.permission.MANAGE_PARTS" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"

--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3146,6 +3146,4 @@
     <string name="profiles_settings_title">情景模式</string>
 
     <string name="mbn_version">MBN 版本</string>
-    <string name="show_battery_percentage">显示电池电量百分比</string>
-    <string name="show_battery_percentage_summary">在状态栏中显示电池电量百分比</string>
 </resources>

--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -283,4 +283,7 @@
     <string name="pa_login_incorrect_login">Login was incorrect</string>
     <string name="pa_pattern_or_fingerprint_header">Must draw pattern or use fingerprint to unlock</string>
 
+    <!-- title for lock screen weather preference -->
+    <string name="lockscreen_weather_enabled_title">Show weather</string>
+
 </resources>

--- a/res/values/customize.xml
+++ b/res/values/customize.xml
@@ -33,7 +33,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <!-- Whether to show_kernel version name -->
     <bool name="def_hide_kernel_version_name">false</bool>
-    <!-- Whether to show a preference item for battery percentage
-        in ("Battery") for India RJIL -->
-    <bool name="config_show_battery_percentage">false</bool>
 </resources>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7603,7 +7603,4 @@
     <string name="lte_data_service_enabled">LTE data service enabled </string>
     <string name="turn_off_wifi_dialog_title">Turn off Wi-Fi</string>
     <string name="turn_off_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>
-    <string name="show_battery_percentage">Show battery percentage</string>
-    <string name="show_battery_percentage_summary">Show battery level percentage inside the status bar</string>
-
 </resources>

--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -67,6 +67,10 @@
             android:title="@string/sms_application_title"
             settings:keywords="@string/keywords_more_default_sms_app" />
 
+        <!-- Weather providers -->
+        <org.cyanogenmod.internal.cmparts.CMPartsPreference
+                android:key="weather_settings" />
+
     </PreferenceCategory>
 
     <com.android.settings.WorkOnlyCategory

--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -75,11 +75,6 @@
                 android:title="@string/camera_gesture_title"
                 android:summary="@string/camera_gesture_desc" />
 
-        <SwitchPreference
-                android:key="camera_double_tap_power_gesture"
-                android:title="@string/camera_double_tap_power_gesture_title"
-                android:summary="@string/camera_double_tap_power_gesture_desc" />
-
         <PreferenceScreen
                 android:key="screensaver"
                 android:title="@string/screensaver_settings_title"

--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -23,12 +23,6 @@
             android:title="@string/battery_saver"
             android:fragment="com.android.settings.fuelgauge.BatterySaverSettings" />
 
-        <SwitchPreference
-            android:key="battery_pct"
-            android:title="@string/show_battery_percentage"
-            android:summary="@string/show_battery_percentage_summary"
-            android:persistent="false" />
-
         <com.android.settings.fuelgauge.BatteryHistoryPreference
             android:key="battery_history" />
 

--- a/res/xml/security_settings_password_sub.xml
+++ b/res/xml/security_settings_password_sub.xml
@@ -47,4 +47,9 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <cyanogenmod.preference.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
 </PreferenceScreen>

--- a/res/xml/security_settings_pattern_sub.xml
+++ b/res/xml/security_settings_pattern_sub.xml
@@ -51,4 +51,9 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <cyanogenmod.preference.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
 </PreferenceScreen>

--- a/res/xml/security_settings_pin_sub.xml
+++ b/res/xml/security_settings_pin_sub.xml
@@ -52,4 +52,9 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <cyanogenmod.preference.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
 </PreferenceScreen>

--- a/res/xml/security_settings_slide_sub.xml
+++ b/res/xml/security_settings_slide_sub.xml
@@ -36,4 +36,9 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <cyanogenmod.preference.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
 </PreferenceScreen>

--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -102,7 +102,7 @@ public class AppOpsDetails extends InstrumentedFragment {
         CharSequence label = mPm.getApplicationLabel(pkgInfo.applicationInfo);
         Drawable icon = mPm.getApplicationIcon(pkgInfo.applicationInfo);
         InstalledAppDetails.setupAppSnippet(appSnippet, label, icon,
-                pkgInfo != null ? pkgInfo.versionName : null);
+                pkgInfo != null ? pkgInfo.versionName : null, null);
     }
 
     private String retrieveAppEntry() {

--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -475,7 +475,8 @@ public class InstalledAppDetails extends AppInfoBase
                     uninstallUpdatesItem, mAppsControlDisallowedAdmin);
         }
 
-        menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo.applicationInfo.protect);
+        menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo != null &&
+                mPackageInfo.applicationInfo != null && mPackageInfo.applicationInfo.protect);
     }
 
     @Override
@@ -553,7 +554,7 @@ public class InstalledAppDetails extends AppInfoBase
         final View appSnippet = mHeader.findViewById(R.id.app_snippet);
         mState.ensureIcon(mAppEntry);
         setupAppSnippet(appSnippet, mAppEntry.label, mAppEntry.icon,
-                pkgInfo != null ? pkgInfo.versionName : null);
+                pkgInfo != null ? pkgInfo.versionName : null, pkgInfo.packageName);
     }
 
     private boolean signaturesMatch(String pkg1, String pkg2) {
@@ -1042,7 +1043,7 @@ public class InstalledAppDetails extends AppInfoBase
     }
 
     public static void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
-            CharSequence versionName) {
+            CharSequence versionName, String packageName) {
         LayoutInflater.from(appSnippet.getContext()).inflate(R.layout.widget_text_views,
                 (ViewGroup) appSnippet.findViewById(android.R.id.widget_frame));
 
@@ -1054,6 +1055,12 @@ public class InstalledAppDetails extends AppInfoBase
         // Version number of application
         TextView appVersion = (TextView) appSnippet.findViewById(R.id.widget_text1);
 
+        if (packageName != null) {
+            TextView appPackage = (TextView) appSnippet.findViewById(R.id.widget_text2);
+            appPackage.setText(packageName);
+            appPackage.setSelected(true);
+        }
+
         if (!TextUtils.isEmpty(versionName)) {
             appVersion.setSelected(true);
             appVersion.setVisibility(View.VISIBLE);

--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -28,8 +28,6 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
-import android.support.v14.preference.SwitchPreference;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.util.TypedValue;
@@ -58,7 +56,6 @@ import java.util.List;
  */
 public class PowerUsageSummary extends PowerUsageBase {
 
-    public static final String SHOW_PERCENT_SETTING = "status_bar_show_battery_percent";
     private static final boolean DEBUG = false;
 
     private static final boolean USE_FAKE_DATA = false;
@@ -67,7 +64,6 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     private static final String KEY_APP_LIST = "app_list";
     private static final String KEY_BATTERY_HISTORY = "battery_history";
-    private static final String KEY_BATTERY_PCT = "battery_pct";
 
     private static final int MENU_STATS_TYPE = Menu.FIRST;
     private static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
@@ -75,10 +71,8 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     private BatteryHistoryPreference mHistPref;
     private PreferenceGroup mAppListGroup;
-    private SwitchPreference mBatteryPct;
 
     private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
-    private boolean isShowBatteryPct;
 
     private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
     private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 10;
@@ -93,11 +87,6 @@ public class PowerUsageSummary extends PowerUsageBase {
         addPreferencesFromResource(R.xml.power_usage_summary);
         mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_HISTORY);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
-        mBatteryPct = (SwitchPreference) findPreference(KEY_BATTERY_PCT);
-        isShowBatteryPct = getResources().getBoolean(R.bool.config_show_battery_percentage);
-        if (!isShowBatteryPct) {
-            getPreferenceScreen().removePreference(mBatteryPct);
-        }
     }
 
     @Override
@@ -108,9 +97,6 @@ public class PowerUsageSummary extends PowerUsageBase {
     @Override
     public void onResume() {
         super.onResume();
-        if (isShowBatteryPct) {
-            updateBatteryPct();
-        }
         refreshStats();
     }
 
@@ -493,24 +479,4 @@ public class PowerUsageSummary extends PowerUsageBase {
             return new SummaryProvider(activity, summaryLoader);
         }
     };
-
-    private void updateBatteryPct() {
-        if (mBatteryPct != null) {
-            mBatteryPct.setChecked(
-                Settings.System.getInt(getContext().getContentResolver(),
-                SHOW_PERCENT_SETTING, 0) != 0);
-            mBatteryPct.setOnPreferenceChangeListener(mBatteryPctChange);
-        }
-    }
-
-    private final Preference.OnPreferenceChangeListener mBatteryPctChange =
-            new Preference.OnPreferenceChangeListener() {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
-            final boolean v = (Boolean) newValue;
-            Settings.System.putInt(getContext().getContentResolver(),
-                    SHOW_PERCENT_SETTING, v ? 1 : 0);
-            return true;
-        }
-    };
 }

--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -161,6 +161,7 @@ public class Index {
     private static final String NODE_NAME_PREFERENCE_SCREEN = "PreferenceScreen";
     private static final String NODE_NAME_CHECK_BOX_PREFERENCE = "CheckBoxPreference";
     private static final String NODE_NAME_LIST_PREFERENCE = "ListPreference";
+    private static final String NODE_NAME_SWITCH_PREFERENCE = "SwitchPreference";
 
     private static final List<String> EMPTY_LIST = Collections.<String>emptyList();
 
@@ -900,7 +901,8 @@ public class Index {
                 title = getDataTitle(context, attrs);
                 keywords = getDataKeywords(context, attrs);
 
-                if (!nodeName.equals(NODE_NAME_CHECK_BOX_PREFERENCE)) {
+                if (!nodeName.endsWith(NODE_NAME_CHECK_BOX_PREFERENCE) &&
+                        !nodeName.endsWith(NODE_NAME_SWITCH_PREFERENCE)) {
                     summary = getDataSummary(context, attrs);
 
                     String entries = null;