Phil Weaver
d7d1f98fa7
Merge "Improve battery saver setting a11y semantics" into pi-dev
...
am: 577f2af92b
2018-04-26 17:27:12 -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
2018-04-26 16:49:32 -07:00
Fan Zhang
169d6a9cd6
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
...
am: 62cd5f7f0f
2018-04-26 16:40:23 -07:00
Maurice Lam
cd26201845
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am: fd45210510
...
am: 160ffd6c4c
2018-04-26 16:30:58 -07:00
Maurice Lam
160ffd6c4c
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
...
am: fd45210510
2018-04-26 16:19:31 -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
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
2018-04-26 15:39:01 -07:00
Jason Monk
069bfaa33d
Merge "Add auto-granting of slice permissions" into pi-dev am: f778a91a88
...
am: 8ead7e26f2
2018-04-26 15:38:21 -07:00
Jeff Sharkey
5b210dad2e
Merge "Increase volume search timeout, fix dialog flow." into pi-dev am: 2e3aacaa7a
...
am: 3595870fa8
2018-04-26 15:37:32 -07:00
Lei Yu
9de539ff0f
Merge "Don't show high usage tip when device is charing" into pi-dev
...
am: 3f34ce9a5b
2018-04-26 15:27:26 -07:00
Lei Yu
59ba07c2da
Merge "Hook up Adaptive Battery to new flag." into pi-dev
...
am: d2e9b56996
2018-04-26 15:26:50 -07:00
Jason Monk
8ead7e26f2
Merge "Add auto-granting of slice permissions" into pi-dev
...
am: f778a91a88
2018-04-26 15:26:14 -07:00
Jeff Sharkey
3595870fa8
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
...
am: 2e3aacaa7a
2018-04-26 15:25:05 -07:00
Lei Yu
1c95856977
Fix crash in anomaly job service
...
If job has been stopped by any reason, we should cancel the background
thread, otherwise it will throw SecurityException when dequeuing from
JobParams.
This CL adds a lock to synchronize the method and stops dequeue work
if job has been canceled.
Change-Id: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Merged-In: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Fixes: 77968649
Test: RunSettingsRoboTests
2018-04-26 15:23:33 -07:00
tmfang
1f37d190c0
Slices feature supports firmware version.
...
- Migrate FirmwareVersionPreferenceController to BasePreferenceController class.
- Because slices feature needs an unique uri,
we should avoid same firmware key in my_device_info.xml and device_info_settings.xml.
- Modify test case for new firmware version controller.
Test: slice uri > content://android.settings.slices/intent/my_device_firmware_version
Test: make RunSettingsRoboTests -j
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: If516bbdb3ddb823db9909123ef694a2beaf5dc66
2018-04-26 15:22:01 -07:00
Lei Yu
3f34ce9a5b
Merge "Don't show high usage tip when device is charing" into pi-dev
2018-04-26 22:08:55 +00:00
Lei Yu
d2e9b56996
Merge "Hook up Adaptive Battery to new flag." into pi-dev
2018-04-26 22:07:53 +00:00
Jason Monk
f778a91a88
Merge "Add auto-granting of slice permissions" into pi-dev
2018-04-26 22:05:19 +00:00
sunnyshao
c624663312
Modified the AirplaneModePreferenceController for slice
...
- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature
Fixes: 78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
2018-04-26 14:49:04 -07:00
Salvador Martinez
60c513d908
Merge "Only start tether when not already enabled" into pi-dev am: f62f91b0b6
...
am: 964d107491
2018-04-26 14:30:25 -07:00
TreeHugger Robot
2e3aacaa7a
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
2018-04-26 21:28:16 +00:00
Jason Monk
0d3322a57b
Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893
...
am: 2332aad2a6
2018-04-26 14:26:38 -07:00
Salvador Martinez
964d107491
Merge "Only start tether when not already enabled" into pi-dev
...
am: f62f91b0b6
2018-04-26 14:15:25 -07:00
Jason Monk
2332aad2a6
Merge "Push full slice index to device index" into pi-dev
...
am: 3d29ca2893
2018-04-26 14:08:36 -07:00
TreeHugger Robot
f62f91b0b6
Merge "Only start tether when not already enabled" into pi-dev
2018-04-26 20:57:57 +00:00
Jason Monk
3d29ca2893
Merge "Push full slice index to device index" into pi-dev
2018-04-26 20:48:41 +00:00
Antony Sargent
86e6366f61
Updated play button icon for paused animations
...
The current play button is mostly white and hard to see with the new
animation videos. This updates it to one which has more blue to stand
out better.
Fixes: 78306799
Test: manual (while watching one of the animations at Settings -> System
-> Gestures; tap the video to pause)
Change-Id: I48deb6c35eccb3ecd21f2aa6dcc3d275c7436f47
2018-04-26 13:46:45 -07:00
Matthew Fritze
8c9e0354b4
Merge "Index database before getting Uri Descendants" into pi-dev am: a7fd137e2d
...
am: 03f1fafaaf
2018-04-26 13:36:00 -07:00
Matthew Fritze
03f1fafaaf
Merge "Index database before getting Uri Descendants" into pi-dev
...
am: a7fd137e2d
2018-04-26 13:27:18 -07:00
Matthew Fritze
a7fd137e2d
Merge "Index database before getting Uri Descendants" into pi-dev
2018-04-26 20:14:53 +00:00
Fan Zhang
117c0fb6e6
Merge "InputMethodAndSubtypeEnabler use DashboardFragment"
2018-04-26 19:12:11 +00:00
Oscar Shu
f64502ea86
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am: 0b302499cd
...
am: 1635941c9a
2018-04-26 11:40:09 -07:00
Oscar Shu
1635941c9a
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
...
am: 0b302499cd
2018-04-26 11:25:15 -07:00
Oscar Shu
0b302499cd
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
2018-04-26 18:16:49 +00:00
Julia Reynolds
4aa42fed67
Redesign zen visual effects screens
...
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
2018-04-26 18:12:38 +00:00
Jan Nordqvist
325dd44145
[automerger skipped] Merge "Hiding data remaining text when available space is too small." into pi-dev am: 5f6937dd88
...
am: 7b0651b63f
2018-04-26 10:53:03 -07:00
Jan Nordqvist
7b0651b63f
Merge "Hiding data remaining text when available space is too small." into pi-dev
...
am: 5f6937dd88
2018-04-26 10:48:03 -07:00
TreeHugger Robot
5f6937dd88
Merge "Hiding data remaining text when available space is too small." into pi-dev
2018-04-26 17:33:53 +00:00
Sean Callanan
b2218a3071
Merge "Settings: update color mode preview to final content" into pi-dev am: 9b08ed63e9
...
am: 7187243565
2018-04-26 10:20:45 -07:00
Salvador Martinez
a4fe5c9871
Only start tether when not already enabled
...
The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.
Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes: 78028548
Fixes: 78441216
Fixes: 74368363
2018-04-26 10:14:54 -07:00
Sean Callanan
7187243565
Merge "Settings: update color mode preview to final content" into pi-dev
...
am: 9b08ed63e9
2018-04-26 10:04:44 -07:00
Sean Callanan
9b08ed63e9
Merge "Settings: update color mode preview to final content" into pi-dev
2018-04-26 16:39:51 +00:00
Jason Monk
fcd5f0f1aa
Push full slice index to device index
...
Test: make RunSettingsRoboTests
Bug: 74555610
Change-Id: I3f0aa1218e1d7e736dc918d83e76423fa81ac6ab
2018-04-26 11:16:04 -04:00
Jason Monk
50e2a99a43
Merge "Fix settings slice caching" into pi-dev am: ab3aa6989a
...
am: fa5e0ece68
2018-04-26 05:56:47 -07:00
Jason Monk
fa5e0ece68
Merge "Fix settings slice caching" into pi-dev
...
am: ab3aa6989a
2018-04-26 05:50:45 -07:00
Jason Monk
ab3aa6989a
Merge "Fix settings slice caching" into pi-dev
2018-04-26 12:46:20 +00:00
Ivan Chiang
6b76e34768
Show docks on previously connected devices page
...
Implement previously connected Dock Devices part into
SavedDeviceGroupController.
Bug: 78095209
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I3dd318556167c98bc90c0c1c7281804177b9ff74
2018-04-26 16:45:16 +08:00
