summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/search
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-01-26 10:15:56 -0800
committerFan Zhang <zhfan@google.com>2018-01-26 12:39:34 -0800
commit881d5796204262f045d1f30596b824505ad8c0b5 (patch)
tree5ba2da440a281eb4a36a3a33d03e970a36c52f72 /src/com/android/settings/search
parentc24930aaf21b2a05e872df6a13fdba48cab61893 (diff)
downloadpackages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.tar.gz
packages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.tar.bz2
packages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.zip
Misc fixes for User page and my device info page
- Rename UserAndAccountDashboard* to AccountDashboard* - Move emergency info from account to device info page - Move auto sync data toggles (4 of them) from Account page to user page - Move the controllers too. UserSettings is a not a DashboardFragment so I had to manually call each controller method. TODO: refactor UserSettings to a DashboardFragment - Move legal information/regulatory info above advance button within device info page. Fixes: 72523158 Bug: 71871075 Test: robotests Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r--src/com/android/settings/search/SearchIndexableResourcesImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
index 034cbd0e06..9d0dce13c1 100644
--- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java
+++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
@@ -25,7 +25,7 @@ import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
import com.android.settings.accessibility.MagnificationPreferenceFragment;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
+import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.applications.SpecialAccessSettings;
@@ -138,7 +138,7 @@ public class SearchIndexableResourcesImpl implements SearchIndexableResources {
addIndex(ScreenLockSettings.class);
addIndex(EncryptionAndCredential.class);
addIndex(ScreenPinningSettings.class);
- addIndex(UserAndAccountDashboardFragment.class);
+ addIndex(AccountDashboardFragment.class);
addIndex(VirtualKeyboardFragment.class);
addIndex(AvailableVirtualKeyboardFragment.class);
addIndex(PhysicalKeyboardFragment.class);