Commit Graph

44074 Commits

Author SHA1 Message Date
TreeHugger Robot
f142ace1d0 Merge "Fuelgauge handle StatsManager Exception API" into pi-dev 2018-04-11 17:02:06 +00:00
Victor Chang
39b13d0234 Shorten the strings in time zone picker menu
Bug: 77641819
Test: manual
Change-Id: Ie87e83cf0b04f5c4fb8cfb999b2842209dc13e3e
2018-04-11 17:53:08 +01:00
TreeHugger Robot
a9fea25929 Merge "Do not set separate challenge flag before clearing lock" into pi-dev 2018-04-11 16:00:59 +00:00
Tony Mak
42b83a604f Badge the icon properly in policy transparency dialog
Following the pattern used within the Settings app to badge the icon.

For location setting, the dialog is shown in work profile user.
Thus ai.loadIcon badged the icon for the first time and
getUserBadgedIcon baged the second time.

Fixes: 77844928
Test: adb shell wm density 560 -> suspend an app -> launch the app ->
      observe the dialog. Repeat the test with original density.

Change-Id: Ie79c3d9aa7b1a155edc74816850b1349fbd2d606
2018-04-11 13:55:57 +00:00
Julia Reynolds
56fd1ac0c7 String changes for suppressing ambient display
Test: make
Bug: 77657376
Change-Id: I7c2795291a82a885a26a0af598bdafb96842d998
2018-04-11 09:27:30 -04:00
TreeHugger Robot
ca67fbfea5 Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev 2018-04-11 13:17:26 +00:00
Rubin Xu
359a6b5c06 Do not set separate challenge flag before clearing lock
This step is redundant since clearLock() would set the flag internally anyway.
In fact setting the flag before calling clearLock() is wrong since it will
lead LockSettingsService.setLockCredential() to think that the target profile
does not have a unified challenge, causing it to use an incorrect existing
credential for password change, leading to untrusted credential change.

Bug: 77892111
Test: Create profile; set separate empty work challenge; observe no crash
Change-Id: I4d76b20706a796654f9389f31ae8c46d51d7adac
2018-04-11 11:43:18 +01:00
TreeHugger Robot
b86e8cadd9 Merge "[Settings] Align volume slider with other preference" into pi-dev 2018-04-11 03:11:06 +00:00
Maurice Lam
8ca084e62b Fix landscape pattern enroll crash
Test: atest SetupChooseLockPatternTest.java
Bug: 77878150
Change-Id: Ie54286765ea0d766bcc9e2c8e56cfbda919d5fd7
2018-04-10 19:53:41 -07:00
TreeHugger Robot
16594545ff Merge "Convert auto-brightness switch to a full screen UI." into pi-dev 2018-04-11 01:28:33 +00:00
TreeHugger Robot
30d3c49329 Merge "Change string" into pi-dev 2018-04-11 01:24:08 +00:00
Bookatz
e832c153c0 Fuelgauge handle StatsManager Exception API
StatsManager now returns Exceptions for certain errors, instead of
returning a boolean. Thus Fuelgauge needs to be updated.

Bug: 77648233
Test: make ROBOTEST_FILTER=AnomalyConfigJobServiceTest RunSettingsRoboTests
Change-Id: I7160ac01141c673c90e33423220dc888a2710340
2018-04-10 18:10:45 -07:00
TreeHugger Robot
dbffb1812d Merge "Prevent ringing updates" into pi-dev 2018-04-10 22:52:10 +00:00
TreeHugger Robot
2c15909bfc Merge "Protect against invalid authority in account sync pref." into pi-dev 2018-04-10 22:49:18 +00:00
TreeHugger Robot
4eeb88ab8a Merge "Remove provisioning dialog from wifi-tethering" into pi-dev 2018-04-10 22:16:35 +00:00
TreeHugger Robot
45fe0bb6a0 Merge "Set parent for auto zen rules to be zen rule page" into pi-dev 2018-04-10 22:09:34 +00:00
TreeHugger Robot
0c532181ab Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev 2018-04-10 22:00:34 +00:00
Julia Reynolds
584aba1f2b Prevent ringing updates
- Add video
- Update text
- Link from Sound settings
- Inherit from BasePreferenceController

Test: make -j RunSettingsRoboTests
Change-Id: If8cd9efd4e6034e6f6864a142a86cbc23bf59dc3
Fixes: 76832936
Fixes: 74410634
2018-04-10 17:32:06 -04:00
Fan Zhang
3dfcb3b326 Convert auto-brightness switch to a full screen UI.
Change-Id: Id5e5ec959201102a7c60372a441dc6813ceedbae
Merged-In: Id5e5ec959201102a7c60372a441dc6813ceedbae
Fixes: 69795935
Test: Existing conformance tests still pass (CodeInspectionTest,
      UniquePreferenceTest, manual search test)
2018-04-10 14:21:00 -07:00
Lei Yu
93ff833316 Merge "Add test flags for battery tips." into pi-dev 2018-04-10 20:44:11 +00:00
TreeHugger Robot
3ec0e4851c Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev 2018-04-10 19:31:03 +00:00
Beverly
7b09d2cebb Set parent for auto zen rules to be zen rule page
Clicking the back button on an automatic zen rule
will now go back to the automatic rule page instead
of the generic Settings page

Change-Id: I5902e01b641ec3e4d0c8b4b4a5b16a0385cbd0ff
Fixes: 77833624
Test: manual
2018-04-10 15:28:17 -04:00
TreeHugger Robot
1f02712e7a Merge "Hide preference when no app restricted" into pi-dev 2018-04-10 18:30:26 +00:00
Daniel Solomon
e96b57a5fb Merge "Hide color mode preference depending on Accessibility settings" into pi-dev 2018-04-10 17:59:26 +00:00
Lei Yu
fa447e698d Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev 2018-04-10 17:39:08 +00:00
Jason Monk
5a974c6335 Merge "Update slice constant reference" into pi-dev 2018-04-10 17:10:29 +00:00
Jason Monk
9b555bf515 Update slice constant reference
Test: build
Bug: 73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe
2018-04-10 10:56:32 -04:00
TreeHugger Robot
34a593db65 Merge "Add zen onboarding screen" into pi-dev 2018-04-10 14:35:44 +00:00
TreeHugger Robot
d7a1c39694 Merge "Notification settings updates" into pi-dev 2018-04-10 13:51:22 +00:00
Julia Reynolds
4b8fe09d72 Add zen onboarding screen
Bug: 77658931
Test: make -j RunSettingsRoboTests
Change-Id: Ifc886148ed742d72b5606a9ce7eb19d0da234c9e
2018-04-10 08:53:09 -04:00
hughchen
af6fa02810 Change string
* Change "Available media devices" to "Available devices"

Bug: 77607383
Test: build
Change-Id: I49cb6c3269eb3847a92403184e2691f7334df96e
2018-04-10 17:15:57 +08:00
timhypeng
3775f969ba Rename onProfileAudioStateChanged() to onAudioModeChanged()
Bug: 74134939
Test: Build
Change-Id: I85895238b6ee16fec85d0cf3dd0242c9ba17a3bd
2018-04-10 15:16:37 +08:00
TreeHugger Robot
09793d19d3 Merge "Add new string for audio switcher" into pi-dev 2018-04-10 04:24:16 +00:00
Daniel Solomon
fbe8a1318b Hide color mode preference depending on Accessibility settings
Currently, when certain Accessibility color transforms are enabled, the
color mode preference radio buttons are disabled. To avoid confusing
users, hide the color mode preference entirely. If the color mode
settings screen is already open when the Accessibility transforms are
enabled, return the user back to the previous screen.

Bug: 77695840
Test: make ROBOTEST_FILTER=ColorModePreferenceFragmentTest
RunSettingsRoboTests -j40

Change-Id: I44812713bdc739b843e5806711d25ea950aa6250
2018-04-09 20:49:43 -07:00
Doris Ling
c8613c7930 Fix robotest failure for ChartDataUsagePreferenceTest.
- the chart usage data is computed using difference between current time
and the timestamp from the usage data. In the test, we are using actual
current time and mock usage data. As the current time varies the test
computating sometimes results in some negative data, and makes the
comparison unpredictable. Change to use a fix "current" time in the test
so that the time difference in computation will be constant.

Fixes: 77824818
Test: make RunSettingsRoboTests
Change-Id: I2d8c166839775469d30015317afdc04eb3d9a2b4
2018-04-09 18:12:46 -07:00
Matthew Fritze
dba7d1c4b3 Unavailable Slices includes DISABLED_DEPENDENT settings
In the change to mark disabled_dependent as available,
it did not change the check in SliceBuilderUtils for the
unavailable Slices. In the case of DISABLED_DEPENDENT, the
setting is available but the Slice is not.

Though it is a simple change, we can now properly test the contents
of Slices, so this change includes tests which should have been in
place earlier and would have caught this bug - duh.

Bug: 71640747
Test: Robotests
Change-Id: I8db5bc80edb337cbf907ce3669aa2bfd9c72f74a
2018-04-09 17:06:47 -07:00
Jeff Sharkey
e9b6d482cb Merge "Update storage wizard to latest UX mocks." into pi-dev 2018-04-09 23:58:34 +00:00
Salvador Martinez
b410c21a01 Merge "Make it possible to have open tether network" into pi-dev 2018-04-09 23:30:35 +00:00
Salvador Martinez
81ca3dd4c0 Remove provisioning dialog from wifi-tethering
We no longer want this dialog to show when a user toggles tethering.
Failures to set up the AP will still be handled correctly.

Test: robotests pass
Bug: 62629055
Change-Id: Id3d0bf9694a1c8b6ae353bfd6634dd0b56813497
2018-04-09 15:27:02 -07:00
Lei Yu
c7b58b6997 Update field for ACTION_ANOMALY_TRIGGERED
Use new field FIELD_ANOMALY_TYPE

Bug: 75976625
Test: RunSettingsRoboTests
Change-Id: Ifb67c687d25e1e35afaadb05f2e9883e8dcf8049
2018-04-09 15:22:19 -07:00
Julia Reynolds
d7815fe18f Notification settings updates
- smaller icons
- text update
- fx header
- fix category header

Test: make -j RunSettingsRoboTests

Change-Id: If822d6db31a8dccf20ee88182cda1aee34aa7675
Fixes: 77325154
Fixes: 77323406
Fixes: 77324677
Fixes: 74408368
2018-04-09 17:24:09 -04:00
Christine Franks
0c92430be4 Merge "Remove Automatic color mode option" into pi-dev 2018-04-09 21:18:28 +00:00
Hansong Zhang
7df9791d24 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9
am: e934ea80a6

Change-Id: I17aa86fa2a02f1a80e9ec8aaa557c3488dd32c21
2018-04-09 14:10:21 -07:00
Hansong Zhang
3369767245 [automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07
am: af077f8d4c  -s ours

Change-Id: I834e60da9920199756dce2206042e4a1ba0c20b9
2018-04-09 14:08:48 -07:00
Hansong Zhang
e934ea80a6 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
am: 3f2dbb7cc9

Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f
2018-04-09 13:54:58 -07:00
Hansong Zhang
af077f8d4c [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4
am: 1b7566cd07

Change-Id: I10c2d233f05ddf566ac38afb7c2cdc5a8e61df25
2018-04-09 13:53:41 -07:00
Hansong Zhang
3f2dbb7cc9 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
am: d59b0eddae

Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd
2018-04-09 13:44:07 -07:00
Hansong Zhang
1b7566cd07 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
am: c4127072f4

Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2
2018-04-09 13:43:04 -07:00
TreeHugger Robot
d59b0eddae Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
2018-04-09 20:29:54 +00:00
Makoto Onuki
8064782d77 Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev 2018-04-09 20:29:30 +00:00