Commit Graph

44799 Commits

Author SHA1 Message Date
Mehdi Alizadeh
c768d05e1b Adds video to swipe up gesture am: a37c5b26a2
am: 899b915222

Change-Id: Id8e3c3aca23ad00355d1db0258acef91b7ea7739
2018-04-11 17:09:21 -07:00
Mehdi Alizadeh
899b915222 Adds video to swipe up gesture
am: a37c5b26a2

Change-Id: I603ab692396126db4993c2e72969da26a122ad32
2018-04-11 16:10:06 -07: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

Change-Id: I397cbc34568b87799bad9a8838ca67e8e8b44e7b
2018-04-11 15:39:18 -07:00
Jason Monk
c8a0024453 Merge "Add more slices to settings" into pi-dev
am: 6be11cc48b

Change-Id: Ia2783879db2a8e171c5ad963dc98a2232a23b16b
2018-04-11 15:29:52 -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

Change-Id: Icb69b66036536d850072852238054e6a10103982
2018-04-11 14:28:16 -07:00
Beverly
5ad550aec4 Merge "Update mSortOrder when changed to frequent" into pi-dev
am: 50fdc109ff

Change-Id: I4b88ae1c396ea15ce9450eaf80a233919e91e85e
2018-04-11 14:15:10 -07:00
TreeHugger Robot
50fdc109ff Merge "Update mSortOrder when changed to frequent" into pi-dev 2018-04-11 21:05:50 +00:00
Julia Reynolds
bbc14ae725 Merge "String changes for suppressing ambient display" into pi-dev am: eaccf907e7
am: d0c1acc874

Change-Id: Ic4f5155aba5c045db1ff0507d073b395694d670c
2018-04-11 13:37:54 -07:00
Fan Zhang
7403e87a03 Merge "Stop logging hotspot password change in logcat." into pi-dev am: 3441c3b073
am: 88f5943c1e

Change-Id: Id71997c56ab7ad54536a70b07f2456147d17ab82
2018-04-11 13:26:39 -07:00
Mehdi Alizadeh
aa61ab12c2 [automerger skipped] Merge "Adds the Swipe Up settings page under gestures" into pi-dev am: cb5899f72e
am: a413eb3672  -s ours

Change-Id: Ifd197e1d985602b2019eae7dd92df803490f1f17
2018-04-11 13:22:36 -07:00
Julia Reynolds
d0c1acc874 Merge "String changes for suppressing ambient display" into pi-dev
am: eaccf907e7

Change-Id: I273ec57ff68b671ced243417e1b0976e6d0fee20
2018-04-11 12:57:35 -07:00
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
TreeHugger Robot
eaccf907e7 Merge "String changes for suppressing ambient display" into pi-dev 2018-04-11 19:37:25 +00:00
Tony Mak
0377855bb7 Merge "Badge the icon properly in policy transparency dialog" into pi-dev am: df68a76e33
am: 394fbec935

Change-Id: Icdf321e9cd3f7c579ed682f938c45eac7b3fd999
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
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
Bookatz
672e67dc4f Merge "Fuelgauge handle StatsManager Exception API" into pi-dev am: f142ace1d0
am: bfd8a58e78

Change-Id: I3e1846bd28eeab02ca544a201394db1475bbc073
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
Bookatz
bfd8a58e78 Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
am: f142ace1d0

Change-Id: I72b975c5e57a96fc02ff318bb0ad4e77410dfcd0
2018-04-11 11:06:27 -07: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
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

Change-Id: I006070aef55c6aa7e852cfe1b4afc7f4a792cde3
2018-04-11 09:26:09 -07: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
be27a9ea2b Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev am: ca67fbfea5
am: 7b167d3af8

Change-Id: Id96450cd4b95d9d49b9896bc3b86ea6ef1d50949
2018-04-11 06:48:27 -07:00
timhypeng
7b167d3af8 Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
am: ca67fbfea5

Change-Id: Ie85e5290a101d83a97a0f98a90249b11d9b6d6f5
2018-04-11 06:37:02 -07: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
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
caxtonchan
c09041ebba Merge "[Settings] Align volume slider with other preference" into pi-dev am: b86e8cadd9
am: e7583d2f35

Change-Id: I9cd2b983587b05764455feb1753cfd1ed01514d9
2018-04-10 20:53:14 -07: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
2bc5851953 [automerger skipped] Merge "Convert auto-brightness switch to a full screen UI." into pi-dev am: 16594545ff
am: 4837cd8bdd  -s ours

Change-Id: I31e71afa44e7d267c13bc75848d236d28856c6b3
2018-04-10 18:52:23 -07:00
hughchen
9725b80e54 Merge "Change string" into pi-dev am: 30d3c49329
am: 01ebb7ba47

Change-Id: Ib6568ac631e037ff20b3be8d092ddf04cd369a11
2018-04-10 18:51:39 -07: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
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

Change-Id: I880b80215cfec3897b18200b18bedbb6c899e241
2018-04-10 16:15:11 -07:00