Fan Zhang
88f5943c1e
Merge "Stop logging hotspot password change in logcat." into pi-dev
...
am: 3441c3b073
Change-Id: I57895081d30566cf12519d25543ab3c5e4632d60
2018-04-11 12:47:04 -07:00
Mehdi Alizadeh
a413eb3672
Merge "Adds the Swipe Up settings page under gestures" into pi-dev
...
am: cb5899f72e
Change-Id: I5a0d9cd0b377e3012691b0f534e020a3a0034014
2018-04-11 12:45:47 -07:00
Fan Zhang
3441c3b073
Merge "Stop logging hotspot password change in logcat." into pi-dev
2018-04-11 19:21:20 +00:00
Mehdi Alizadeh
cb5899f72e
Merge "Adds the Swipe Up settings page under gestures" into pi-dev
2018-04-11 19:07:31 +00:00
Tony Mak
394fbec935
Merge "Badge the icon properly in policy transparency dialog" into pi-dev
...
am: df68a76e33
Change-Id: I751c5ad1654279c11775cb9fc1dd9bfcefdcaed7
2018-04-11 11:59:30 -07:00
TreeHugger Robot
df68a76e33
Merge "Badge the icon properly in policy transparency dialog" into pi-dev
2018-04-11 18:16:29 +00:00
Bookatz
bfd8a58e78
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
...
am: f142ace1d0
Change-Id: I72b975c5e57a96fc02ff318bb0ad4e77410dfcd0
2018-04-11 11:06:27 -07:00
Mehdi Alizadeh
528fe0ca14
Adds the Swipe Up settings page under gestures
...
The illusteration video is not included yet.
Merged-In: I7f2b2f3251a795dfd74dbbb442692e42a5a2966e
Bug: 77549883
Test: Unit tests and Manual test
Change-Id: I04f01f0814f16e4e006291e61ddb07cea8e7c0d6
2018-04-11 11:03:06 -07:00
Fan Zhang
6cc2730a59
Stop logging hotspot password change in logcat.
...
Change-Id: I705ec6413cef8e8435c9020d8b7434f8e641b0d4
Fixes: 77880733
Test: rebuild
2018-04-11 10:32:16 -07:00
TreeHugger Robot
f142ace1d0
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
2018-04-11 17:02:06 +00:00
Rubin Xu
317cd819b0
Merge "Do not set separate challenge flag before clearing lock" into pi-dev
...
am: a9fea25929
Change-Id: Ifc079c0aa27867e9dde1c3b9b406944875330256
2018-04-11 09:14:10 -07: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
timhypeng
7b167d3af8
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
...
am: ca67fbfea5
Change-Id: Ie85e5290a101d83a97a0f98a90249b11d9b6d6f5
2018-04-11 06:37:02 -07: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
caxtonchan
e7583d2f35
Merge "[Settings] Align volume slider with other preference" into pi-dev
...
am: b86e8cadd9
Change-Id: I54ef4b779672eaae825b2d291d1720df2a2ed3d0
2018-04-10 20:32:07 -07:00
TreeHugger Robot
b86e8cadd9
Merge "[Settings] Align volume slider with other preference" into pi-dev
2018-04-11 03:11:06 +00:00
Fan Zhang
4837cd8bdd
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
...
am: 16594545ff
Change-Id: I29f445292f789dd564cda99c0d5de95d1ed99ee2
2018-04-10 18:41:36 -07:00
hughchen
01ebb7ba47
Merge "Change string" into pi-dev
...
am: 30d3c49329
Change-Id: I7aed24faa5303eda4f2b9d45fcf557737e5337ce
2018-04-10 18:40:46 -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
Julia Reynolds
8176af9610
Merge "Prevent ringing updates" into pi-dev
...
am: dbffb1812d
Change-Id: I119e70461080de521e590e7ffb138184978f4d79
2018-04-10 16:00:22 -07:00
Fan Zhang
2e49b6fdac
Merge "Protect against invalid authority in account sync pref." into pi-dev
...
am: 2c15909bfc
Change-Id: I8639c271a60462516ae9639ad237081572df4135
2018-04-10 15:59:23 -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
Salvador Martinez
0b889da802
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
...
am: 4eeb88ab8a
Change-Id: I9d9716bec63e0d7361eebc8f984e655031849976
2018-04-10 15:22:13 -07:00
Beverly
752824221d
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
...
am: 45fe0bb6a0
Change-Id: Ie2e698f225ea43912621ea56f695c59f084118d0
2018-04-10 15:18:51 -07:00
Patrick Baumann
f575445171
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
...
am: 0c532181ab
Change-Id: Id922f460c951685ed032f5e7d0267f27efdd3689
2018-04-10 15:17:41 -07: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
de4199e3db
Merge "Add test flags for battery tips." into pi-dev
...
am: 93ff833316
Change-Id: Icf06d57e93992c00b19bd203bbd55d8fb19c3f12
2018-04-10 14:02:10 -07:00
Lei Yu
93ff833316
Merge "Add test flags for battery tips." into pi-dev
2018-04-10 20:44:11 +00:00
Matthew Fritze
ea52f72840
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
...
am: 3ec0e4851c
Change-Id: I6b497d1b7b9d733016f1908ae429fe493a607511
2018-04-10 12:38:28 -07: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
Lei Yu
1b82df6906
Merge "Hide preference when no app restricted" into pi-dev
...
am: 1f02712e7a
Change-Id: I6cabb95f74b21841874cb7bd710aefb04db078f0
2018-04-10 12:03:56 -07:00
TreeHugger Robot
1f02712e7a
Merge "Hide preference when no app restricted" into pi-dev
2018-04-10 18:30:26 +00:00
Daniel Solomon
c767f493d8
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
...
am: e96b57a5fb
Change-Id: I0b746d7e2a8e2d06a82d3beeb2c5beb5fc79ff3b
2018-04-10 11:02:04 -07:00
Lei Yu
44f6508070
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
...
am: fa447e698d
Change-Id: I33948cea8fd3b869fef93eea0ce0aea33a4280d0
2018-04-10 10:59:59 -07: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
fd1be7d153
Merge "Update slice constant reference" into pi-dev
...
am: 5a974c6335
Change-Id: I9137eb037c731f87453d489cc98f67d5f8a63122
2018-04-10 10:21:21 -07: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
Julia Reynolds
a87381e9a8
Merge "Add zen onboarding screen" into pi-dev
...
am: 34a593db65
Change-Id: Ifefd7007f798d7ff912f9e465d0b4788584570f1
2018-04-10 07:50:30 -07:00