881d5796204262f045d1f30596b824505ad8c0b5 - SHIFTPHONES/android/packages/apps/Settings

commit	881d5796204262f045d1f30596b824505ad8c0b5	[log] [tgz]
author	Fan Zhang <zhfan@google.com>	Fri Jan 26 10:15:56 2018 -0800
committer	Fan Zhang <zhfan@google.com>	Fri Jan 26 12:39:34 2018 -0800
tree	5ba2da440a281eb4a36a3a33d03e970a36c52f72
parent	c24930aaf21b2a05e872df6a13fdba48cab61893 [diff]

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

AndroidManifest.xml[diff]
res/values/strings.xml[diff]
res/xml/accounts_dashboard_settings.xml[Added - diff]
res/xml/my_device_info.xml[diff]
res/xml/user_and_accounts_settings.xml[Deleted - diff]
res/xml/user_settings.xml[diff]
src/com/android/settings/Settings.java[diff]
src/com/android/settings/SettingsActivity.java[diff]
src/com/android/settings/accounts/AccountDashboardFragment.java[Renamed from src/com/android/settings/accounts/UserAndAccountDashboardFragment.java - diff]
src/com/android/settings/core/gateway/SettingsGateway.java[diff]
src/com/android/settings/dashboard/DashboardFragmentRegistry.java[diff]
src/com/android/settings/dashboard/conditional/WorkModeCondition.java[diff]
src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java[diff]
src/com/android/settings/search/SearchIndexableResourcesImpl.java[diff]
src/com/android/settings/security/LockscreenDashboardFragment.java[diff]
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java[Renamed from src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java - diff]
src/com/android/settings/users/AutoSyncDataPreferenceController.java[Renamed from src/com/android/settings/accounts/AutoSyncDataPreferenceController.java - diff]
src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java[Renamed from src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceController.java - diff]
src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java[Renamed from src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java - diff]
src/com/android/settings/users/UserCapabilities.java[diff]
src/com/android/settings/users/UserSettings.java[diff]
tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java[Renamed from tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java - diff]
tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java - diff]
tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java - diff]
tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java - diff]
tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java - diff]

26 files changed

tree: 5ba2da440a281eb4a36a3a33d03e970a36c52f72