Commit Graph

45375 Commits

Author SHA1 Message Date
Maurice Lam
160ffd6c4c Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am: fd45210510

Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c
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
9de539ff0f Merge "Don't show high usage tip when device is charing" into pi-dev
am: 3f34ce9a5b

Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612
2018-04-26 15:27:26 -07:00
Lei Yu
59ba07c2da Merge "Hook up Adaptive Battery to new flag." into pi-dev
am: d2e9b56996

Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf
2018-04-26 15:26:50 -07:00
Jason Monk
8ead7e26f2 Merge "Add auto-granting of slice permissions" into pi-dev
am: f778a91a88

Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1
2018-04-26 15:26:14 -07:00
Jeff Sharkey
3595870fa8 Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am: 2e3aacaa7a

Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826
2018-04-26 15:25:05 -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
TreeHugger Robot
2e3aacaa7a Merge "Increase volume search timeout, fix dialog flow." into pi-dev 2018-04-26 21:28:16 +00:00
Salvador Martinez
964d107491 Merge "Only start tether when not already enabled" into pi-dev
am: f62f91b0b6

Change-Id: If28a47b85fab06484298196305e862759998a72f
2018-04-26 14:15:25 -07:00
Jason Monk
2332aad2a6 Merge "Push full slice index to device index" into pi-dev
am: 3d29ca2893

Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
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
03f1fafaaf Merge "Index database before getting Uri Descendants" into pi-dev
am: a7fd137e2d

Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b
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
Oscar Shu
1635941c9a Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b
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
Jan Nordqvist
7b0651b63f Merge "Hiding data remaining text when available space is too small." into pi-dev
am: 5f6937dd88

Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
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
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

Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd
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
fa5e0ece68 Merge "Fix settings slice caching" into pi-dev
am: ab3aa6989a

Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3
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
Ivan Chiang
98e37691c4 Show Dock devices in Connected devices page
Implement Connected Dock Devices part into
ConnectedDeviceGroupController.

Bug: 77945034
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Id5a75217f64d84038222604fca40613361e6f45d
2018-04-26 16:45:16 +08:00
Fan Zhang
237260dfba Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
am: a6b773a3e1

Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
2018-04-25 21:31:02 -07:00
TreeHugger Robot
a6b773a3e1 Merge "Use colorPrimary for search bar and suggestion background" into pi-dev 2018-04-26 04:27:30 +00:00
Maurice Lam
0283372fc2 Hide cancel button in Confirm Lock Pattern
Test: Manual
Bug: 77790615
Bug: 77565685
Change-Id: Ic3a12d169be037376f040dd1129678e814760091
2018-04-25 19:57:24 -07:00
Sean Callanan
3c1caf7232 Settings: update color mode preview to final content
Content provided based on image selection and optimization
by the graphics team.

Bug: 69264342
Test: hand testing on B1
Change-Id: I12d1fefab2d7a01a44fccb4960d61ee2c6a25017
2018-04-25 19:38:21 -07:00
Antony Sargent
7746cd94e3 Merge "Layout changes for new animation assets" into pi-dev
am: 10e91c7e1b

Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
2018-04-25 17:52:26 -07:00
TreeHugger Robot
10e91c7e1b Merge "Layout changes for new animation assets" into pi-dev 2018-04-26 00:40:10 +00:00
xshu
0aabe7f3a8 Hide apps with NETWORK_SETTINGS from special wifi settings
A recent change is made in the wifi framework to allow apps with
NETWORK_SETTINGS permission to bypass checks for the CHANGE_WIFI_STATE
permission. Remove apps with NETWORK_SETTINGS permission from
the list because turning off CHANGE_WIFI_STATE for those apps will not
do anything.

Bug: 78228349
Test: compile, robo test
Manual test:
flash
go to Settings -> Apps & notifications -> Advanced -> Special app access
-> Wi-Fi control
Verify that the "Settings" app is no longer in the list
Top right corner -> show system
Verify that "System UI" is no longer in the list
Change-Id: Ia430a6fb4d5dee534a03609ad1877976204935b2
2018-04-25 16:13:12 -07:00
Matthew Fritze
838d69da50 Index database before getting Uri Descendants
onGetSliceDescendants would return empty results if
the call was made before the database was indexed.
This CL checks the index before building the list.

Change-Id: I2e0f88893138a048dbd529d465d68fa4b1a3dc12
Fixes: 78196823
Test: robotests
2018-04-25 15:53:16 -07:00
Antony Sargent
d762ff23a6 Layout changes for new animation assets
The animation videos are changing to have a white background, so we want to
match that in the background color to avoid horizontal bands of the current
grey background color on the edges of the new videos. We're also adding a
divider between the video and the content beneath it.

This CL also includes the new illustration video for the launcher gesture.

Fixes: 77861241
Fixes: 77474484
Test: manual (visit all entries in Settings->System->Gestures, as well as
Settings->Display->Adaptive brightness)

Change-Id: I976782645c9431d40e005960b80353a7da2b89b8
2018-04-25 14:56:58 -07:00
Fan Zhang
0890c337ba Use colorPrimary for search bar and suggestion background
Bug: 78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Merged-In: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
2018-04-25 21:44:16 +00:00
Fan Zhang
7d4a11e3d3 Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
am: 5605795526

Change-Id: I82717663e3fb2cd95dd9e4a51839b3d0027440d4
2018-04-25 14:36:26 -07:00
Fan Zhang
5605795526 Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev 2018-04-25 21:28:15 +00:00
Ivan Chiang
e7f3afba9d Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
am: 820a26c6bd

Change-Id: Ie77ac8eb096ebfa37445233481ad31d9511c1b7e
2018-04-25 12:36:25 -07:00
Jan Nordqvist
be73af0369 Hiding data remaining text when available space is too small.
Bug: 77799887

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53390a36e74f9832bdc7757cd67d51064e8a77f3
Merged-In: I53390a36e74f9832bdc7757cd67d51064e8a77f3
2018-04-25 12:30:06 -07:00
TreeHugger Robot
820a26c6bd Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev 2018-04-25 19:21:56 +00:00
hjchangliao
f549cd1e05 Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am: dc09b3ff49

Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7
2018-04-25 10:16:41 -07:00
Doris Ling
c7494be56e Merge "Fixes crash in security settings." into pi-dev
am: abe44c2674

Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b
2018-04-25 10:16:05 -07:00
TreeHugger Robot
dc09b3ff49 Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev 2018-04-25 17:13:48 +00:00
hjchangliao
1ff466675d Make Nfc/Beam searchable based on feature availability
Update logic of updateNonIndexableKeys,
in BaseNfcPreferenceController to fix issue.
Add robotest to avoid same problem.

Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c
Fixes: 78540155
Test: make RunSettingsRoboTests
2018-04-25 17:12:33 +00:00