commit 5db5b02b40dad293da6dda067b823e12bb4a7b54
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 13 02:17:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 02:17:36 2016 +0000
tree 0b93cf9f2daa6c093b376019036ed456e968ab90
parent 55cdee27381e0133ebb1be50230039a471d7d83d
parent b2c8c9cc9cfe77934e98bfdf8a5c797f08a6ce3f

Merge "Add connected devices dashboard category for new IA."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 82dd09f..d496046 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3190,6 +3190,19 @@
                        android:value="true" />
         </activity-alias>
 
+        <activity-alias android:name="BackupResetDashboardAlias"
+                        android:targetActivity="Settings$PrivacySettingsActivity">
+            <intent-filter android:priority="60">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.PrivacySettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity-alias>
+
         <!-- Alias for developer setting in new IA. Should merge into TargetActivity when launch -->
         <activity-alias android:name="DevelopmentSettingsDashboardAlias"
                         android:targetActivity="Settings$DevelopmentSettingsActivity"

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index b3f067a..8118dab 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -792,14 +792,16 @@
             super.onBindViewHolder(holder, position);
             if (position == mHighlightPosition) {
                 View v = holder.itemView;
-                if (v.getBackground() != null) {
-                    final int centerX = v.getWidth() / 2;
-                    final int centerY = v.getHeight() / 2;
-                    v.getBackground().setHotspot(centerX, centerY);
-                }
-                v.setPressed(true);
-                v.setPressed(false);
-                mHighlightPosition = -1;
+                v.post(() -> {
+                    if (v.getBackground() != null) {
+                        final int centerX = v.getWidth() / 2;
+                        final int centerY = v.getHeight() / 2;
+                        v.getBackground().setHotspot(centerX, centerY);
+                    }
+                    v.setPressed(true);
+                    v.setPressed(false);
+                    mHighlightPosition = -1;
+                });
             }
         }
     }