Lei Yu
2aa48e18f1
Merge "Update battery settings strings" into pi-dev am: 17a463130e
...
am: 118f29591a
2018-04-11 20:38:23 -07:00
TreeHugger Robot
17a463130e
Merge "Update battery settings strings" into pi-dev
2018-04-12 03:22:43 +00:00
Lei Yu
40bb1e8488
Update battery settings strings
...
1. Change "screenTime" to "lastFullChargeTime" in high usage dialog
2. Update "Background restriction" strings
3. Update footer string
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I07c149123c4ee1a69dd81c9a9e6eaa5df69b60b4
2018-04-11 17:50:30 -07:00
Julia Reynolds
6c52f0b757
Merge "Add disabled checkbox preference" into pi-dev am: ccdecc664c
...
am: c57bb42dde
2018-04-11 17:17:42 -07:00
Mehdi Alizadeh
c768d05e1b
Adds video to swipe up gesture am: a37c5b26a2
...
am: 899b915222
2018-04-11 17:09:21 -07:00
TreeHugger Robot
ccdecc664c
Merge "Add disabled checkbox preference" into pi-dev
2018-04-11 23:07:40 +00:00
Mehdi Alizadeh
a37c5b26a2
Adds video to swipe up gesture
...
Bug: 77549883
Test: Manual test
Change-Id: I818a5952864cd1a7b62501bb23ed15b4c9fabd27
2018-04-11 22:46:41 +00:00
Jason Monk
a6684b558b
Merge "Add more slices to settings" into pi-dev am: 6be11cc48b
...
am: c8a0024453
2018-04-11 15:39:18 -07:00
TreeHugger Robot
6be11cc48b
Merge "Add more slices to settings" into pi-dev
2018-04-11 22:01:25 +00:00
Beverly
0e90651dc2
Merge "Update mSortOrder when changed to frequent" into pi-dev am: 50fdc109ff
...
am: 5ad550aec4
2018-04-11 14:28:16 -07:00
TreeHugger Robot
50fdc109ff
Merge "Update mSortOrder when changed to frequent" into pi-dev
2018-04-11 21:05:50 +00:00
Fan Zhang
7403e87a03
Merge "Stop logging hotspot password change in logcat." into pi-dev am: 3441c3b073
...
am: 88f5943c1e
2018-04-11 13:26:39 -07:00
Tony Mak
0377855bb7
Merge "Badge the icon properly in policy transparency dialog" into pi-dev am: df68a76e33
...
am: 394fbec935
2018-04-11 12:24:30 -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
Bookatz
672e67dc4f
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev am: f142ace1d0
...
am: bfd8a58e78
2018-04-11 11:56:55 -07:00
Beverly
50f641be29
Update mSortOrder when changed to frequent
...
Update mSortOrder so when the activity is resumed, the
apps are sorted how the user wants
Test: make ROBOTEST_FILTER=ManageApplicationsTest RunSettingsRoboTests
Change-Id: I422846aada29ee254996b2e94da27af7ed935a0b
Fixes: 77691626
2018-04-11 14:43:06 -04:00
TreeHugger Robot
df68a76e33
Merge "Badge the icon properly in policy transparency dialog" into pi-dev
2018-04-11 18:16:29 +00:00
Jason Monk
a2b38e09fd
Add more slices to settings
...
Test: open settings
Bug: 74555610
Change-Id: I061685342f61a6a43670b7f3378d2a6918bcf495
2018-04-11 14:06:21 -04: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
Julia Reynolds
18922b50cb
Add disabled checkbox preference
...
A checkbox preference that users can't change, but with non-disabled
test for legibilty.
Test: make -j RunSettingsRoboTests
Bug: 77657376
Change-Id: Iea9bbcc5efbf80cbc380fb8d5a360fe8386889a0
2018-04-11 13:49:58 -04: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
57e3f4aa50
Merge "Do not set separate challenge flag before clearing lock" into pi-dev am: a9fea25929
...
am: 317cd819b0
2018-04-11 09:26:09 -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
be27a9ea2b
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev am: ca67fbfea5
...
am: 7b167d3af8
2018-04-11 06:48:27 -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
Mehdi Alizadeh
d18edec417
Adds the Swipe Up settings page under gestures
...
The illusteration video is not included yet.
Bug: 77549883
Test: Unit tests and Manual test
Change-Id: I7f2b2f3251a795dfd74dbbb442692e42a5a2966e
2018-04-11 05:40:12 +00: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
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
d628116e2f
Merge "Convert auto-brightness switch to a full screen UI."
2018-04-10 23:49:23 +00:00
Julia Reynolds
a660cf1176
Merge "Prevent ringing updates" into pi-dev am: dbffb1812d
...
am: 8176af9610
2018-04-10 16:15:11 -07:00
Fan Zhang
3b3e951b6f
Merge "Protect against invalid authority in account sync pref." into pi-dev am: 2c15909bfc
...
am: 2e49b6fdac
2018-04-10 16:13:33 -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
5a4e5cbef4
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev am: 4eeb88ab8a
...
am: 0b889da802
2018-04-10 15:30:08 -07:00
TreeHugger Robot
4eeb88ab8a
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
2018-04-10 22:16:35 +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
89f668ce29
Convert auto-brightness switch to a full screen UI.
...
Change-Id: Id5e5ec959201102a7c60372a441dc6813ceedbae
Bug: 69795935
Test: Existing conformance tests still pass (CodeInspectionTest,
UniquePreferenceTest, manual search test)
2018-04-10 21:25:09 +00: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
6afd882210
Merge "Add test flags for battery tips." into pi-dev am: 93ff833316
...
am: de4199e3db
2018-04-10 14:13:33 -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
a1df08c426
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev am: 3ec0e4851c
...
am: ea52f72840
2018-04-10 13:03:49 -07:00
TreeHugger Robot
3ec0e4851c
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
2018-04-10 19:31:03 +00:00
Lei Yu
1af677903a
Merge "Hide preference when no app restricted" into pi-dev am: 1f02712e7a
...
am: 1b82df6906
2018-04-10 12:13:43 -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
f414f5ab2d
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev am: e96b57a5fb
...
am: c767f493d8
2018-04-10 11:27:58 -07:00
Lei Yu
67956894e7
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev am: fa447e698d
...
am: 44f6508070
2018-04-10 11:24:10 -07:00
