OSDN Git Service
Ivan Chiang [Fri, 27 Apr 2018 02:13:07 +0000 (19:13 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev am:
720a224e00
am:
e598b1ae03
Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253
Ivan Chiang [Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev
am:
720a224e00
Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064
TreeHugger Robot [Fri, 27 Apr 2018 01:59:16 +0000 (01:59 +0000)]
Merge changes I3dd31855,Id5a75217 into pi-dev
* changes:
Show docks on previously connected devices page
Show Dock devices in Connected devices page
TreeHugger Robot [Fri, 27 Apr 2018 01:10:09 +0000 (01:10 +0000)]
Merge "Slices feature supports firmware version."
Phil Weaver [Fri, 27 Apr 2018 00:57:23 +0000 (17:57 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev am:
577f2af92b
am:
d7d1f98fa7
Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89
Phil Weaver [Fri, 27 Apr 2018 00:27:12 +0000 (17:27 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
am:
577f2af92b
Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377
Phil Weaver [Thu, 26 Apr 2018 23:50:54 +0000 (23:50 +0000)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 23:49:32 +0000 (16:49 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am:
62cd5f7f0f
am:
169d6a9cd6
Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
Fan Zhang [Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am:
62cd5f7f0f
Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83
Maurice Lam [Thu, 26 Apr 2018 23:30:58 +0000 (16:30 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am:
fd45210510
am:
160ffd6c4c
Change-Id: Ie21d2b916927cd200eaf1195647dd983ac7594c4
Maurice Lam [Thu, 26 Apr 2018 23:19:31 +0000 (16:19 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am:
fd45210510
Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c
Fan Zhang [Thu, 26 Apr 2018 23:12:14 +0000 (23:12 +0000)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:58:37 +0000 (22:58 +0000)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:39:52 +0000 (15:39 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev am:
3f34ce9a5b
am:
9de539ff0f
Change-Id: I661e0cecc068f56dbd3fa1a0de32a639432a79de
Lei Yu [Thu, 26 Apr 2018 22:39:01 +0000 (15:39 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev am:
d2e9b56996
am:
59ba07c2da
Change-Id: I875f0264133f8358b4f85ccba18b672c0a05015f
Jason Monk [Thu, 26 Apr 2018 22:38:21 +0000 (15:38 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev am:
f778a91a88
am:
8ead7e26f2
Change-Id: I27cf09c0875b72d9e9478eed410884fa3813daf1
Jeff Sharkey [Thu, 26 Apr 2018 22:37:32 +0000 (15:37 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev am:
2e3aacaa7a
am:
3595870fa8
Change-Id: I6d5a007bc61c4e136f75c0462df4967e1861a92d
Lei Yu [Thu, 26 Apr 2018 22:27:26 +0000 (15:27 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev
am:
3f34ce9a5b
Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612
Lei Yu [Thu, 26 Apr 2018 22:26:50 +0000 (15:26 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
am:
d2e9b56996
Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf
Jason Monk [Thu, 26 Apr 2018 22:26:14 +0000 (15:26 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev
am:
f778a91a88
Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1
Jeff Sharkey [Thu, 26 Apr 2018 22:25:05 +0000 (15:25 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am:
2e3aacaa7a
Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826
tmfang [Mon, 23 Apr 2018 09:37:14 +0000 (17:37 +0800)]
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
Lei Yu [Thu, 26 Apr 2018 22:08:55 +0000 (22:08 +0000)]
Merge "Don't show high usage tip when device is charing" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:07:53 +0000 (22:07 +0000)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
Jason Monk [Thu, 26 Apr 2018 22:05:19 +0000 (22:05 +0000)]
Merge "Add auto-granting of slice permissions" into pi-dev
sunnyshao [Tue, 24 Apr 2018 07:57:25 +0000 (15:57 +0800)]
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
Salvador Martinez [Thu, 26 Apr 2018 21:30:25 +0000 (14:30 -0700)]
Merge "Only start tether when not already enabled" into pi-dev am:
f62f91b0b6
am:
964d107491
Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
TreeHugger Robot [Thu, 26 Apr 2018 21:28:16 +0000 (21:28 +0000)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
Jason Monk [Thu, 26 Apr 2018 21:26:38 +0000 (14:26 -0700)]
Merge "Push full slice index to device index" into pi-dev am:
3d29ca2893
am:
2332aad2a6
Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
Salvador Martinez [Thu, 26 Apr 2018 21:15:25 +0000 (14:15 -0700)]
Merge "Only start tether when not already enabled" into pi-dev
am:
f62f91b0b6
Change-Id: If28a47b85fab06484298196305e862759998a72f
Jason Monk [Thu, 26 Apr 2018 21:08:36 +0000 (14:08 -0700)]
Merge "Push full slice index to device index" into pi-dev
am:
3d29ca2893
Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
TreeHugger Robot [Thu, 26 Apr 2018 20:57:57 +0000 (20:57 +0000)]
Merge "Only start tether when not already enabled" into pi-dev
Jason Monk [Thu, 26 Apr 2018 20:48:41 +0000 (20:48 +0000)]
Merge "Push full slice index to device index" into pi-dev
Matthew Fritze [Thu, 26 Apr 2018 20:36:00 +0000 (13:36 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev am:
a7fd137e2d
am:
03f1fafaaf
Change-Id: I700fd063084ad0e41289feb552b3a1bfafd3cd57
Matthew Fritze [Thu, 26 Apr 2018 20:27:18 +0000 (13:27 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev
am:
a7fd137e2d
Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b
Matthew Fritze [Thu, 26 Apr 2018 20:14:53 +0000 (20:14 +0000)]
Merge "Index database before getting Uri Descendants" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 19:12:11 +0000 (19:12 +0000)]
Merge "InputMethodAndSubtypeEnabler use DashboardFragment"
Oscar Shu [Thu, 26 Apr 2018 18:40:09 +0000 (11:40 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am:
0b302499cd
am:
1635941c9a
Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1
Oscar Shu [Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am:
0b302499cd
Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b
Oscar Shu [Thu, 26 Apr 2018 18:16:49 +0000 (18:16 +0000)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
Jan Nordqvist [Thu, 26 Apr 2018 17:53:03 +0000 (10:53 -0700)]
[automerger skipped] Merge "Hiding data remaining text when available space is too small." into pi-dev am:
5f6937dd88
am:
7b0651b63f -s ours
Change-Id: I51d36b9a8248a2c1047ddd6854d7c6675057c219
Jan Nordqvist [Thu, 26 Apr 2018 17:48:03 +0000 (10:48 -0700)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
am:
5f6937dd88
Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
TreeHugger Robot [Thu, 26 Apr 2018 17:33:53 +0000 (17:33 +0000)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
Sean Callanan [Thu, 26 Apr 2018 17:20:45 +0000 (10:20 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev am:
9b08ed63e9
am:
7187243565
Change-Id: I49aefbb3c01760977e07535dc305921ceb548b6b
Salvador Martinez [Tue, 24 Apr 2018 23:03:34 +0000 (16:03 -0700)]
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
Sean Callanan [Thu, 26 Apr 2018 17:04:44 +0000 (10:04 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev
am:
9b08ed63e9
Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd
Sean Callanan [Thu, 26 Apr 2018 16:39:51 +0000 (16:39 +0000)]
Merge "Settings: update color mode preview to final content" into pi-dev
Jason Monk [Fri, 20 Apr 2018 18:08:57 +0000 (14:08 -0400)]
Push full slice index to device index
Test: make RunSettingsRoboTests
Bug:
74555610
Change-Id: I3f0aa1218e1d7e736dc918d83e76423fa81ac6ab
Jason Monk [Thu, 26 Apr 2018 12:56:47 +0000 (05:56 -0700)]
Merge "Fix settings slice caching" into pi-dev am:
ab3aa6989a
am:
fa5e0ece68
Change-Id: Ia88dc12ead0cab4b335062cba4fbf7db8066e285
Jason Monk [Thu, 26 Apr 2018 12:50:45 +0000 (05:50 -0700)]
Merge "Fix settings slice caching" into pi-dev
am:
ab3aa6989a
Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3
Jason Monk [Thu, 26 Apr 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Fix settings slice caching" into pi-dev
Ivan Chiang [Wed, 18 Apr 2018 11:06:36 +0000 (19:06 +0800)]
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
Ivan Chiang [Thu, 12 Apr 2018 10:21:51 +0000 (18:21 +0800)]
Show Dock devices in Connected devices page
Implement Connected Dock Devices part into
ConnectedDeviceGroupController.
Bug:
77945034
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Id5a75217f64d84038222604fca40613361e6f45d
Fan Zhang [Thu, 26 Apr 2018 04:35:54 +0000 (21:35 -0700)]
[automerger skipped] Merge "Use colorPrimary for search bar and suggestion background" into pi-dev am:
a6b773a3e1
am:
237260dfba -s ours
Change-Id: Icf0c5752f5bb7774383f1bbf591fc5e5284fbd0b
Fan Zhang [Thu, 26 Apr 2018 04:31:02 +0000 (21:31 -0700)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
am:
a6b773a3e1
Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
TreeHugger Robot [Thu, 26 Apr 2018 04:27:30 +0000 (04:27 +0000)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
Maurice Lam [Thu, 26 Apr 2018 00:53:13 +0000 (17:53 -0700)]
Hide cancel button in Confirm Lock Pattern
Test: Manual
Bug:
77790615
Bug:
77565685
Change-Id: Ic3a12d169be037376f040dd1129678e814760091
Fan Zhang [Thu, 26 Apr 2018 02:50:46 +0000 (02:50 +0000)]
Merge "Implement LifecycleObserver in pulse notif controller."
Fan Zhang [Thu, 26 Apr 2018 02:41:48 +0000 (02:41 +0000)]
Merge "Use colorPrimary for search bar and suggestion background"
TreeHugger Robot [Thu, 26 Apr 2018 02:40:34 +0000 (02:40 +0000)]
Merge "Replace PackageManagerWrapper with PackageManager"
Sean Callanan [Thu, 26 Apr 2018 02:38:21 +0000 (19:38 -0700)]
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
Fan Zhang [Thu, 26 Apr 2018 00:50:23 +0000 (17:50 -0700)]
Implement LifecycleObserver in pulse notif controller.
Change-Id: Icb8d55c5a72bc6a8d6566c43e193b7f12377b4c9
Fixes:
74923755
Test: manually run through lifecycle
Test: atest CodeInspectionTest
Antony Sargent [Thu, 26 Apr 2018 01:01:30 +0000 (18:01 -0700)]
Merge "Layout changes for new animation assets" into pi-dev am:
10e91c7e1b
am:
7746cd94e3
Change-Id: I1828a02d9c08a1fd79ec1accdeffb6d4efb3a417
Antony Sargent [Thu, 26 Apr 2018 00:52:26 +0000 (17:52 -0700)]
Merge "Layout changes for new animation assets" into pi-dev
am:
10e91c7e1b
Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
TreeHugger Robot [Thu, 26 Apr 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Layout changes for new animation assets" into pi-dev
rafftsai [Thu, 12 Apr 2018 03:56:32 +0000 (11:56 +0800)]
InputMethodAndSubtypeEnabler use DashboardFragment
- Move preference log to InputMethodAndSubtypePreferenceController
- Add input_methods_subtype.xml
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.inputmethod
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: atest UniquePreferenceTest
Change-Id: I45b6e8303d94ef07d17016eeed1d728432a70d98
xshu [Fri, 20 Apr 2018 00:36:46 +0000 (17:36 -0700)]
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
Matthew Fritze [Tue, 24 Apr 2018 22:30:20 +0000 (15:30 -0700)]
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
Jan Nordqvist [Wed, 18 Apr 2018 22:20:03 +0000 (15:20 -0700)]
Hiding data remaining text when available space is too small.
Bug:
77799887
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53390a36e74f9832bdc7757cd67d51064e8a77f3
Antony Sargent [Mon, 23 Apr 2018 22:34:32 +0000 (15:34 -0700)]
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
Fan Zhang [Wed, 25 Apr 2018 19:40:14 +0000 (12:40 -0700)]
Use colorPrimary for search bar and suggestion background
Bug:
78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Merged-In: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Fan Zhang [Wed, 25 Apr 2018 21:41:59 +0000 (14:41 -0700)]
[automerger skipped] Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev am:
5605795526
am:
7d4a11e3d3 -s ours
Change-Id: I65653749d989a051d4cbadc528701c41ec691038
Fan Zhang [Wed, 25 Apr 2018 19:40:14 +0000 (12:40 -0700)]
Use colorPrimary for search bar and suggestion background
Bug:
78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Fan Zhang [Wed, 25 Apr 2018 21:36:26 +0000 (14:36 -0700)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
am:
5605795526
Change-Id: I82717663e3fb2cd95dd9e4a51839b3d0027440d4
Fan Zhang [Wed, 25 Apr 2018 21:28:15 +0000 (21:28 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
Ivan Chiang [Wed, 25 Apr 2018 19:43:01 +0000 (12:43 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev am:
820a26c6bd
am:
e7f3afba9d
Change-Id: I0b1e8dd9f23b2077051341a991f309ace42cbb34
Ivan Chiang [Wed, 25 Apr 2018 19:36:25 +0000 (12:36 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
am:
820a26c6bd
Change-Id: Ie77ac8eb096ebfa37445233481ad31d9511c1b7e
Jan Nordqvist [Wed, 18 Apr 2018 22:20:03 +0000 (15:20 -0700)]
Hiding data remaining text when available space is too small.
Bug:
77799887
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53390a36e74f9832bdc7757cd67d51064e8a77f3
Merged-In: I53390a36e74f9832bdc7757cd67d51064e8a77f3
TreeHugger Robot [Wed, 25 Apr 2018 19:21:56 +0000 (19:21 +0000)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
hjchangliao [Wed, 25 Apr 2018 17:23:11 +0000 (10:23 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev am:
dc09b3ff49
am:
f549cd1e05
Change-Id: Ied4f01787aec0cf8f261483e942615abd1889918
Doris Ling [Wed, 25 Apr 2018 17:22:36 +0000 (10:22 -0700)]
Merge "Fixes crash in security settings." into pi-dev am:
abe44c2674
am:
c7494be56e
Change-Id: I06db8956a4cb67aa650b7b32dab1c83130d7a97a
hjchangliao [Wed, 25 Apr 2018 17:16:41 +0000 (10:16 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am:
dc09b3ff49
Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7
Doris Ling [Wed, 25 Apr 2018 17:16:05 +0000 (10:16 -0700)]
Merge "Fixes crash in security settings." into pi-dev
am:
abe44c2674
Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b
TreeHugger Robot [Wed, 25 Apr 2018 17:13:48 +0000 (17:13 +0000)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
hjchangliao [Wed, 25 Apr 2018 03:38:05 +0000 (11:38 +0800)]
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
Doris Ling [Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)]
Merge "Fixes crash in security settings." into pi-dev
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl
Also convert the controller to TogglePrefCtrl, and register it in xml.
Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Merged-In: Ifbc95364b47690117b2875cba1cdc4761ad205be
Fixes:
71972185
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 25 Apr 2018 15:25:54 +0000 (08:25 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev am:
69d12406f0
am:
e9045a7a41
Change-Id: I20c27b31caa7a44b6d114780a0b7b18206f75d12
Fan Zhang [Wed, 25 Apr 2018 15:14:28 +0000 (08:14 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
am:
69d12406f0
Change-Id: I9e209e042b129f9c1e92878c11ec6affa4e40ccb
TreeHugger Robot [Wed, 25 Apr 2018 15:07:32 +0000 (15:07 +0000)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
caxtonchan [Wed, 25 Apr 2018 04:04:45 +0000 (21:04 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev am:
3f5444b9e4
am:
67d44d9d61
Change-Id: I36b249159ef8d0a6d099ba776c5d682ea596e5e3
caxtonchan [Wed, 25 Apr 2018 03:54:43 +0000 (20:54 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
am:
3f5444b9e4
Change-Id: Ie376aafe5ebfff928e5011ac772f5faaeb494c0d
TreeHugger Robot [Wed, 25 Apr 2018 03:42:17 +0000 (03:42 +0000)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
Salvador Martinez [Wed, 25 Apr 2018 02:13:32 +0000 (19:13 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev am:
6fcce25b72
am:
f6d5f31564
Change-Id: I8b59411b62292b8f65a62f60bde8981c66f3401a
Salvador Martinez [Wed, 25 Apr 2018 02:08:51 +0000 (19:08 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev
am:
6fcce25b72
Change-Id: Ia85fbd3b5068f739254fae45403fdf2f4b45f595
TreeHugger Robot [Wed, 25 Apr 2018 02:00:48 +0000 (02:00 +0000)]
Merge "Check if boxes still available when restoring state" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 01:36:51 +0000 (01:36 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl"
caxtonchan [Mon, 23 Apr 2018 07:04:21 +0000 (15:04 +0800)]
Hide the audio switcher if it is not relevant
Bug:
78317337
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Change-Id: I9824941cf410b26ad166aa163d7cccd3bfc31a06
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl
Also convert the controller to TogglePrefCtrl, and register it in xml.
Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Bug:
71972185
Test: make RunSettingsRoboTests
Doris Ling [Tue, 24 Apr 2018 20:19:27 +0000 (13:19 -0700)]
Fixes crash in security settings.
- save the loaded icon drawable to a local var, instead of setting it to
the tile.icon and later reset it, so that we will not run into the issue
that the icon will become null when this is called multiple times.
Change-Id: I0fc73961986cddd97ad1e74b0609ac47d011cc87
Fixes:
78445923
Test: make RunSettingsRoboTests
OSDN Git Service
