Commit Graph

22396 Commits

Author SHA1 Message Date
android-build-team Robot
c66613306a Merge "Workaround task-resolution bug in AM" into pi-dev am: bb5a46fabd
am: f22e98e7c7

Change-Id: I0c2407144a87accaa8e884b31ecc0af2893b6d6e
2018-05-01 16:21:13 -07:00
android-build-team Robot
bb5a46fabd Merge "Workaround task-resolution bug in AM" into pi-dev 2018-05-01 23:08:15 +00:00
Eran Messeri
7b36ccdd9b Merge "Require work profile to be unlocked for changing notification settings in a different way" 2018-05-01 20:51:39 +00:00
Doris Ling
61909b5af1 Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev am: 5ddff9371d
am: 674fec7f3c

Change-Id: I0c9610bb467a9443480def643bb96135478473e5
2018-05-01 13:10:23 -07:00
Doris Ling
5ddff9371d Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev 2018-05-01 19:58:56 +00:00
android-build-team Robot
979ece432a Merge "Disable 'remove' option while setting is selected" into pi-dev am: 24cfa88e19
am: 035e2006e8

Change-Id: Ibae065e51330af2c7abb72a10ac84d284666e4d2
2018-05-01 12:45:07 -07:00
android-build-team Robot
24cfa88e19 Merge "Disable 'remove' option while setting is selected" into pi-dev 2018-05-01 19:34:15 +00:00
Fan Zhang
10b4bc01f1 Merge "Add a test to verify lifecycle events are triggered" into pi-dev am: 139ebd91c0
am: cd3e50d4a5

Change-Id: I01d49c423c5ef56d59a51a2f03b4f11d956e19bc
2018-05-01 12:33:06 -07:00
Fan Zhang
139ebd91c0 Merge "Add a test to verify lifecycle events are triggered" into pi-dev 2018-05-01 19:04:44 +00:00
Julia Reynolds
5c19e7b6b0 Update zen onboarding ui am: 29ba3601b0
am: fa6482c4a4

Change-Id: I9010987409185d91ff039657cf2b20aeaefd01ad
2018-05-01 11:05:14 -07:00
Julia Reynolds
ded64625f4 Disable 'remove' option while setting is selected
Test: robotests
Bug: 78916709
Change-Id: Id1dfc3b61a80c2e0677472ae84dc7425116825f0
2018-05-01 13:45:53 -04:00
Winson Chung
7bfc62f562 Workaround task-resolution bug in AM
- Keep launching notification settings in the Settings task. This is not
  the expected behavior, but only a workaround until b/72420153 is
  fixed.

Bug: 72420153
Test: Enter PIP, go to app > notifications > additional settings, ensure
      that it doesn't start in the PIP task

Change-Id: I73e704a283285462d4884db21923818cfb6deead
2018-05-01 10:23:59 -07:00
Julia Reynolds
29ba3601b0 Update zen onboarding ui
Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
2018-05-01 15:11:03 +00:00
android-build-team Robot
d3ff522a0b Merge "Fix a NPE where developer options page crash sometimes." into pi-dev am: d940a680a5
am: aee1191c72

Change-Id: Iac0d2a8551d9c1ba230890dadb1bdf2b6edb12b9
2018-04-30 20:51:39 -07:00
android-build-team Robot
6451b7b91b Merge "Migrate PaymentSettings to DashboardFragment" 2018-05-01 01:37:34 +00:00
Fan Zhang
1f1c7042f5 Add a test to verify lifecycle events are triggered
- Added a footer in feature flags, displaying "Experimental" during
  onStart.
- Ui test to verify the text shows correctly.

Change-Id: Ibf4f79cb3c12e460384e83201a16005a18d6437d
Fixes: 78887450
Test: atest
2018-05-01 01:32:49 +00:00
android-build-team Robot
d940a680a5 Merge "Fix a NPE where developer options page crash sometimes." into pi-dev 2018-05-01 01:30:41 +00:00
Doris Ling
c3e4619af1 Fix crash in ExternalSourceDetailPreferenceController.
- Add null check for the package info when trying to retrieve the
install app state. During package update, the package info might becomes
null. The App info activity will finish in that case, but this method
might be called before the activity actually finishes.

Change-Id: I18ff448666dfb403bb6693fccd3e54276db36f37
Fixes: 78257414
Test: make RunSettingsRoboTests
2018-04-30 17:38:29 -07:00
chiujason
ff244c0e40 Migrate PaymentSettings to DashboardFragment
- Move preference related logic to controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I061a194c170f63fab51974f26c24be43d67d6f6f
2018-04-30 17:24:58 -07:00
Fan Zhang
ecadd0119d Fix a NPE where developer options page crash sometimes.
Developer options page crash for restricted users because the page
removes all preferences while DashboardFeatureProvider tries to
manipulate preferences on screen.

Added a null check to skip changin prefs in DashboardFeatureProvider
because the pref is going to be removed either way.

Change-Id: Ic83fd0dfb2a906605fb1d992d7b36c2163630e89
Fixes: 78655710
Test: robotests
2018-04-30 16:54:10 -07:00
android-build-team Robot
bd825f408b Merge "Fix NPE during unit test" 2018-04-30 23:44:27 +00:00
Fan Zhang
16de45d8ec Fix NPE during unit test
As of ag/3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.

Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes: 78897071
Test: atest
2018-04-30 15:17:22 -07:00
android-build-team Robot
bf9c07cb59 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am: 8e55299f98
am: 72cedc72a4

Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938
2018-04-30 14:29:58 -07:00
android-build-team Robot
8e55299f98 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev 2018-04-30 21:08:51 +00:00
Fan Zhang
7987ccfffd Reset development tile values when turning off dev option.
Change-Id: Ib2e8ea3bfcffca5b2ee3d0ebd3c0c524239d2145
Fixes: 78654641
Test: robotest
2018-04-30 20:27:52 +00:00
Beverly Tai
6761acdd33 Revert "Get rid of charging sounds toggle"
Bug: 77912907
This reverts commit fbe721b1b3.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
2018-04-30 20:01:40 +00:00
Eran Messeri
d204af1aa8 Require work profile to be unlocked for changing notification settings in a different way
Rather than check for the state of the work profile in
LockScreenNotificationPreferenceController#handlePreferenceTreeClick, do so in
the RestrictedListPreference#performClick.
The drawback of checking the state in handlePreferenceTreeClick is that the
preferences are displayed first and then the requirement to unlock/enable the
work profile is displayed on top of it.

This is rather poor UX, so switch to doing the check in performClick and
returning early if the work profile needs to be unlocked/enabled.
This is similar to Patchset 1 from ag/3805482.
The main difference is that the user is returned to the settings screen
both after enabling the work profile and unlocking it.

Test: Manually with TestDPC
Test: atest SettingsRoboTests:RestrictedListPreferenceTest
Bug: 77408805
Change-Id: Id168911b082fffac193cd7c7a658ab92d6ce2c15
2018-04-30 11:29:36 +01:00
android-build-team Robot
167612df0e Merge "Migrate ChooseAccountActivity to DashboardFragment" 2018-04-28 06:10:25 +00:00
Emily Chuang
b279b1c025 Migrate ChooseAccountActivity to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.

Bug: 73899467
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f
2018-04-27 22:17:23 -07:00
android-build-team Robot
f2dd6d74ac Merge "Remove the gear icon and change tapping event" 2018-04-27 17:13:13 +00:00
Julia Reynolds
ea360d687d Merge "Redesign zen visual effects screens" into pi-dev 2018-04-27 12:41:58 +00:00
Julia Reynolds
4cf8bfd5b2 Redesign zen visual effects screens
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2
2018-04-27 11:12:34 +00:00
Julia Reynolds
302b27ab9a Merge "Redesign zen visual effects screens" 2018-04-27 11:08:57 +00:00
hughchen
7ef4fd8085 Remove the gear icon and change tapping event
* For fix the conflicts in pi-dev, cherry pick the ag/3944480 in
  master and merge the conflict.
* Remove the gear icon in "currently connected" section.
* Change the tapping event in "currently connected" section.
  When tapping device in this section, take user to device detail page.
* Add test to verify when ConnectedBluetoothDeviceUpdater add preference
  the shouldHideSecondTarget() is return true.

Bug: 78490845
Test: make -j40 RunSettingsRoboTests
Change-Id: I25f8455def3c38e24dea9af9e9e29ba37c250f67
2018-04-27 16:35:09 +08:00
TreeHugger Robot
8f73818b03 Merge "Fix crash in anomaly job service" 2018-04-27 03:57:57 +00:00
Tony Huang
e0b3323bde Merge "Update StorageSummaryDonutPreference content" into pi-dev am: 070238df13
am: 3ba6c42ab0

Change-Id: Ibb80c748317948ab1b5b62f606c06375ee0c1cc9
2018-04-26 20:09:01 -07:00
Cyril Lee
1590ce33e8 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am: 66640d6412
am: 7691959d04

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3
2018-04-26 20:08:01 -07:00
Tony Huang
070238df13 Merge "Update StorageSummaryDonutPreference content" into pi-dev 2018-04-27 02:58:15 +00:00
Cyril Lee
66640d6412 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev 2018-04-27 02:53:30 +00:00
Ivan Chiang
121d53072e Merge changes I3dd31855,Id5a75217 into pi-dev am: 720a224e00
am: e598b1ae03

Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253
2018-04-26 19:13:07 -07:00
TreeHugger Robot
720a224e00 Merge changes I3dd31855,Id5a75217 into pi-dev
* changes:
  Show docks on previously connected devices page
  Show Dock devices in Connected devices page
2018-04-27 01:59:16 +00:00
TreeHugger Robot
0e6977da39 Merge "Slices feature supports firmware version." 2018-04-27 01:10:09 +00:00
Phil Weaver
16904e3019 Merge "Improve battery saver setting a11y semantics" into pi-dev am: 577f2af92b
am: d7d1f98fa7

Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89
2018-04-26 17:57:23 -07:00
Phil Weaver
577f2af92b Merge "Improve battery saver setting a11y semantics" into pi-dev 2018-04-26 23:50:54 +00:00
Fan Zhang
5f492647c8 Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5f7f0f
am: 169d6a9cd6

Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
2018-04-26 16:49:32 -07:00
Maurice Lam
cd26201845 Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am: fd45210510
am: 160ffd6c4c

Change-Id: Ie21d2b916927cd200eaf1195647dd983ac7594c4
2018-04-26 16:30:58 -07:00
Fan Zhang
62cd5f7f0f Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev 2018-04-26 23:12:14 +00:00
TreeHugger Robot
fd45210510 Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev 2018-04-26 22:58:37 +00:00
Lei Yu
34b82a3505 Merge "Don't show high usage tip when device is charing" into pi-dev am: 3f34ce9a5b
am: 9de539ff0f

Change-Id: I661e0cecc068f56dbd3fa1a0de32a639432a79de
2018-04-26 15:39:52 -07:00
Lei Yu
aff80459f2 Merge "Hook up Adaptive Battery to new flag." into pi-dev am: d2e9b56996
am: 59ba07c2da

Change-Id: I875f0264133f8358b4f85ccba18b672c0a05015f
2018-04-26 15:39:01 -07:00