OSDN Git Service
TreeHugger Robot [Wed, 23 May 2018 19:29:24 +0000 (19:29 +0000)]
Merge "Inline slider with header"
Matthew Fritze [Tue, 22 May 2018 13:50:49 +0000 (06:50 -0700)]
Inline slider with header
Add a header to the slider slices to allow for a second line of text.
This is important to add more context to slices outside of settings.
Bug:
80157462
Test: robotests
Change-Id: Ida90c9377afb19de320dfce54175f51eee088cfe
Matthew Fritze [Wed, 23 May 2018 18:25:35 +0000 (11:25 -0700)]
[automerger skipped] Merge "Add isSliceable API to BasePrefController" into pi-dev am:
ef950c24bd
am:
0cf8b408f9 -s ours
Change-Id: I01a7cd3c08acb13773cd920bc95d5f1dbbdc9297
Matthew Fritze [Wed, 23 May 2018 17:52:35 +0000 (10:52 -0700)]
Merge "Add isSliceable API to BasePrefController" into pi-dev
am:
ef950c24bd
Change-Id: Idbcc5c9960270b5713478aa5f22d524dc52fba91
Fan Zhang [Wed, 23 May 2018 17:14:35 +0000 (17:14 +0000)]
Merge "Convert BatterySaverButton controller to Slice compatible."
Jayachandran Chinnakkannu [Wed, 23 May 2018 16:57:56 +0000 (16:57 +0000)]
Merge "Remove connectivity monitor switch from developer options"
TreeHugger Robot [Wed, 23 May 2018 16:01:22 +0000 (16:01 +0000)]
Merge "Return null when setting can't be changed."
TreeHugger Robot [Wed, 23 May 2018 13:44:05 +0000 (13:44 +0000)]
Merge "Add Location Slice"
Matthew Fritze [Fri, 18 May 2018 17:23:34 +0000 (10:23 -0700)]
Add Location Slice
Location is an intent-only Slice.
Test: Robotests
Bug:
67997314
Change-Id: I07e27683b46fe4ded8215009a983bb909555fb59
Fan Zhang [Tue, 22 May 2018 21:12:32 +0000 (14:12 -0700)]
Convert BatterySaverButton controller to Slice compatible.
- Update preference key to match the key defined in SettingsSlicesContract
- Model TwoStateButtonPreference similar to TwoStatePreference (add
setChecked, isChecked method)
- Remove TwoStateButtonPreferenceController entirely because all methods
are moved into Preference directly for better encapsulation.
- Make BatterySaverButtonPrefController direclty implement
TogglePreferenceController. It was not possible before because the
interface between TwoStateButtonPreferene is too different from
TwoStatePreference.
Bug:
80106671
Test: robotests
Change-Id: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d
Matthew Fritze [Wed, 23 May 2018 01:24:06 +0000 (18:24 -0700)]
Return null when setting can't be changed.
If a Slice cannot be changed, return null instead of
an error slice.
Bug:
80155832
Test: robotestst
Change-Id: Ib94136c449c6d9c1911f89833bba62fd2263daa4
Matthew Fritze [Tue, 22 May 2018 20:04:38 +0000 (13:04 -0700)]
Update airplane mode key to match framework constant
Change pref key for airplane mode to "airplane_mode" to match the
constant declared in SettingsSlicesContract.
Bug:
80106671
Test: robotests
Change-Id: I898befffbdafc3004fc127414edd04f60ff2554e
TreeHugger Robot [Tue, 22 May 2018 23:40:24 +0000 (23:40 +0000)]
Merge "Add isSliceable API to BasePrefController" into pi-dev
Bill Yi [Tue, 22 May 2018 22:47:46 +0000 (15:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
1dbed5f4f2 -s ours
am:
33ad1ae844 -s ours
Change-Id: Ic00088c41f062fefaa3168b7daaa25c4d00ccba5
Bill Yi [Tue, 22 May 2018 22:43:38 +0000 (15:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1dbed5f4f2 -s ours
Change-Id: If38ef61a43b054ab10cc9f58062c43ab19b36347
Matthew Fritze [Sat, 19 May 2018 00:59:26 +0000 (17:59 -0700)]
Add isSliceable API to BasePrefController
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.
Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.
Test: robotests
Change-Id: I85848c2cdf3e151fa94b33dd1dc5c0374ef94b5b
Merged-In: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
Fixes:
79779103
TreeHugger Robot [Tue, 22 May 2018 22:37:33 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Fan Zhang [Tue, 22 May 2018 22:05:48 +0000 (15:05 -0700)]
Merge "Make VideoPreference not important for talkback." into pi-dev am:
32c3b87db9
am:
8486fc70c5
Change-Id: Ibb75b4b608061a622c3c56041802722100a934c7
Fan Zhang [Tue, 22 May 2018 21:59:09 +0000 (14:59 -0700)]
Merge "Make VideoPreference not important for talkback." into pi-dev
am:
32c3b87db9
Change-Id: I222b3a652c3345a66799c3920c3183128b37254b
TreeHugger Robot [Tue, 22 May 2018 21:31:09 +0000 (21:31 +0000)]
Merge "Make VideoPreference not important for talkback." into pi-dev
Bill Yi [Tue, 22 May 2018 21:13:06 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I06fb64abf52b7fdc00173dbc1ce5cb01cb9fcc61
TreeHugger Robot [Tue, 22 May 2018 21:02:45 +0000 (21:02 +0000)]
Merge "Add isSliceable API to BasePrefController"
Jayachandran C [Mon, 21 May 2018 23:41:40 +0000 (16:41 -0700)]
Remove connectivity monitor switch from developer options
Test: Verify connectivity monitor switch is no more shown
under developer options
Bug:
79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
hughchen [Tue, 22 May 2018 18:18:15 +0000 (11:18 -0700)]
Merge "When BT is off hide rename preference" into pi-dev am:
a419c4717d
am:
a29fe74817
Change-Id: I9e2068de44126344af52532fbe076acd9121883d
Matthew Fritze [Sat, 19 May 2018 00:59:26 +0000 (17:59 -0700)]
Add isSliceable API to BasePrefController
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.
Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.
Test: robotests
Bug:
79779103
Change-Id: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
hughchen [Tue, 22 May 2018 18:00:11 +0000 (11:00 -0700)]
Merge "When BT is off hide rename preference" into pi-dev
am:
a419c4717d
Change-Id: I505144261b8f06a33ee8cd5280707a2b35180178
TreeHugger Robot [Tue, 22 May 2018 17:48:31 +0000 (17:48 +0000)]
Merge "When BT is off hide rename preference" into pi-dev
Matthew Fritze [Tue, 22 May 2018 17:19:54 +0000 (10:19 -0700)]
[automerger skipped] Merge "Fix availability status for AOD gestures" into pi-dev am:
39f98e9018
am:
94b265ffe7 -s ours
Change-Id: I4eb4d086a1ad220969ce9f3ae90618db628a02f6
Matthew Fritze [Tue, 22 May 2018 17:09:17 +0000 (10:09 -0700)]
Merge "Fix availability status for AOD gestures" into pi-dev
am:
39f98e9018
Change-Id: Iea6cab0934634ec124eb8e792d84ae06386ad03c
TreeHugger Robot [Tue, 22 May 2018 16:50:12 +0000 (16:50 +0000)]
Merge "Fix availability status for AOD gestures" into pi-dev
Fan Zhang [Tue, 22 May 2018 16:33:34 +0000 (09:33 -0700)]
Make VideoPreference not important for talkback.
Change-Id: I9856afbd3f5140fa0c426bcc443d2f33e2ffc335
Fixes:
79887358
Test: talkback
hughchen [Mon, 21 May 2018 12:46:57 +0000 (20:46 +0800)]
When BT is off hide rename preference
* Hide the preference when BT is off, shown preference when BT is on.
Bug:
78247352
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceNamePreferenceControllerTest
Change-Id: Id1e11c7b546d7ac5bc8606e8645d07d77f2b522f
Julia Reynolds [Tue, 22 May 2018 16:24:48 +0000 (09:24 -0700)]
Merge "Fix field reordering on toggle switch" into pi-dev am:
8eac6665e8
am:
4bc1985a8c
Change-Id: I8db22efc4042ee91c2a3fbb3d6bfc632a91344b3
Julia Reynolds [Tue, 22 May 2018 16:17:29 +0000 (09:17 -0700)]
Merge "Fix field reordering on toggle switch" into pi-dev
am:
8eac6665e8
Change-Id: I64a86334e106e5f0a4a8b3a6140411dc5d0ffabd
Julia Reynolds [Tue, 22 May 2018 16:09:05 +0000 (16:09 +0000)]
Merge "Fix field reordering on toggle switch" into pi-dev
Julia Reynolds [Tue, 22 May 2018 15:51:52 +0000 (08:51 -0700)]
Merge "Don't reset channel field when loading the app" into pi-dev am:
7ae4b0bbdc
am:
a7aee6eea5
Change-Id: Ib6804e0fa325d04360b620aa36f043c6c707db1b
TreeHugger Robot [Tue, 22 May 2018 15:48:21 +0000 (15:48 +0000)]
Merge "Fix availability status for AOD gestures"
Julia Reynolds [Tue, 22 May 2018 15:46:19 +0000 (08:46 -0700)]
Merge "Don't reset channel field when loading the app" into pi-dev
am:
7ae4b0bbdc
Change-Id: I5f2a0fc22a698822bbe25c545950dc97364a66a2
TreeHugger Robot [Tue, 22 May 2018 15:36:22 +0000 (15:36 +0000)]
Merge "Don't reset channel field when loading the app" into pi-dev
Matthew Fritze [Tue, 22 May 2018 15:19:11 +0000 (08:19 -0700)]
[automerger skipped] Add Bluetooth Slice am:
25fc14c607
am:
225e3175af -s ours
Change-Id: I7fa7596f781321dda580ea5b30a2026e950fab58
Matthew Fritze [Tue, 22 May 2018 15:13:31 +0000 (08:13 -0700)]
Add Bluetooth Slice
am:
25fc14c607
Change-Id: If9d6b6ce4728853523a58329712bb823b35ce087
Julia Reynolds [Tue, 22 May 2018 13:09:22 +0000 (09:09 -0400)]
Fix field reordering on toggle switch
Every field needs an explicit order.
Test: manual
Change-Id: Iae533db9e9d240bd0dc14da04a1831fe23005f9e
Fixes:
79749266
Matthew Fritze [Thu, 3 May 2018 22:12:18 +0000 (15:12 -0700)]
Add Bluetooth Slice
Bluetooth slice is added a special case, due to the migration of
bluetooth to a Switch Bar instead of a preference with a controller.
Change-Id: I8b70bb66c862255a4e8d2426ac09939ba6197624
Merged-In: Icfdcd77601ad1e64e0f6c352a8d691f0181515c8
Fixes:
67997327
Test: robotests
Julia Reynolds [Tue, 22 May 2018 13:07:46 +0000 (09:07 -0400)]
Don't reset channel field when loading the app
Only save data that's changed.
Change-Id: Iaa8265f543a7c1ec418d9d016986e0a253f28df6
Fixes:
79216856
Test: robo tests
Chia-I Wu [Tue, 22 May 2018 07:31:52 +0000 (00:31 -0700)]
Merge "Show color modes from config_availableColorModes" into pi-dev am:
5c99a41a9c
am:
2dc9650a76
Change-Id: Ib248095ea777d13b4449369096953de574c98bb5
Chia-I Wu [Tue, 22 May 2018 07:19:54 +0000 (00:19 -0700)]
Merge "Show color modes from config_availableColorModes" into pi-dev
am:
5c99a41a9c
Change-Id: I82de74655a8c000580355d857599278c445fe20e
Chia-I Wu [Tue, 22 May 2018 07:09:53 +0000 (07:09 +0000)]
Merge "Show color modes from config_availableColorModes" into pi-dev
Lei Yu [Tue, 22 May 2018 05:30:58 +0000 (22:30 -0700)]
Merge "When restrict, use uid inside AppInfo" into pi-dev am:
4376993a87
am:
0a084dadc2
Change-Id: I649e128ef5070562349de6951c9b3c2f1fbc1a76
Lei Yu [Tue, 22 May 2018 05:27:29 +0000 (22:27 -0700)]
Merge "When restrict, use uid inside AppInfo" into pi-dev
am:
4376993a87
Change-Id: Ib882c9b94e05e56492d7a85db55564ca91ef46e1
TreeHugger Robot [Tue, 22 May 2018 05:22:24 +0000 (05:22 +0000)]
Merge "When restrict, use uid inside AppInfo" into pi-dev
tim peng [Tue, 22 May 2018 05:06:52 +0000 (22:06 -0700)]
[automerger skipped] Merge changes I6d4f8ec3,Id4c1e86c into pi-dev am:
e3a87548e5
am:
002f385b62 -s ours
Change-Id: Id1c1ee7ec1a3726f10ad2c041ad413d63133214d
tim peng [Tue, 22 May 2018 04:58:29 +0000 (21:58 -0700)]
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
am:
e3a87548e5
Change-Id: I6c063352b3c2fc6ab3b79baff222c976a5e14184
tim peng [Tue, 22 May 2018 04:44:15 +0000 (04:44 +0000)]
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
* changes:
Make device discoverable in Connected Devices settings page
Add bluetooth discoverable footer preference in connected devices page
TreeHugger Robot [Tue, 22 May 2018 03:57:35 +0000 (03:57 +0000)]
Merge "Add Bluetooth Slice"
Antony Sargent [Tue, 22 May 2018 03:55:58 +0000 (20:55 -0700)]
Merge "Update music, notifications, device information, and movies icons" into pi-dev am:
7ecbfd23f2
am:
0e0698ef27
Change-Id: I7b28e82b415f2f3c9c0e872ca2efa72c0f5831f4
Antony Sargent [Tue, 22 May 2018 03:52:28 +0000 (20:52 -0700)]
Merge "Update music, notifications, device information, and movies icons" into pi-dev
am:
7ecbfd23f2
Change-Id: I2736fcb0c0f46d7c13c9c2732d55e423a670cb08
TreeHugger Robot [Tue, 22 May 2018 03:45:32 +0000 (03:45 +0000)]
Merge "Update music, notifications, device information, and movies icons" into pi-dev
Fan Zhang [Tue, 22 May 2018 03:16:17 +0000 (20:16 -0700)]
[automerger skipped] Merge "Misc GAR fixes" into pi-dev am:
c9d258a11e
am:
59395efb39 -s ours
Change-Id: Id7323bb8cce7c04a49eab183e10aaf040c39bf8d
Fan Zhang [Tue, 22 May 2018 03:12:22 +0000 (20:12 -0700)]
Merge "Misc GAR fixes" into pi-dev
am:
c9d258a11e
Change-Id: I3bf714c5077004ed9c80fc7cb7515179a5df8e46
TreeHugger Robot [Tue, 22 May 2018 03:08:15 +0000 (03:08 +0000)]
Merge "Misc GAR fixes" into pi-dev
Matthew Fritze [Thu, 3 May 2018 22:12:18 +0000 (15:12 -0700)]
Add Bluetooth Slice
Bluetooth slice is added a special case, due to the migration of
bluetooth to a Switch Bar instead of a preference with a controller.
Bug:
67997327
Test: robotests
Change-Id: Icfdcd77601ad1e64e0f6c352a8d691f0181515c8
Chia-I Wu [Thu, 15 Mar 2018 15:35:20 +0000 (08:35 -0700)]
Show color modes from config_availableColorModes
Check config_availableColorModes to decide which color mode options
to show.
Bug:
73824924
Bug:
73825738
Test: 2016, 2017, and 2018 devices
Change-Id: I42915595348061ff4b3f2fdf14753e96dfcb2052
hughchen [Tue, 22 May 2018 02:56:49 +0000 (19:56 -0700)]
[automerger skipped] Merge "Dynamically showing "driving mode"" into pi-dev am:
346063dd5c
am:
a4daa41df9 -s ours
Change-Id: I5ee36e42a3d82b6dc798f7739d31a988a72b99d1
hughchen [Tue, 22 May 2018 02:53:19 +0000 (19:53 -0700)]
Merge "Dynamically showing "driving mode"" into pi-dev
am:
346063dd5c
Change-Id: I1109f44cbf0053e4e340ac933b442733bf11da26
TreeHugger Robot [Tue, 22 May 2018 02:48:34 +0000 (02:48 +0000)]
Merge "Dynamically showing "driving mode"" into pi-dev
timhypeng [Fri, 11 May 2018 07:41:10 +0000 (15:41 +0800)]
Make device discoverable in Connected Devices settings page
* Set preference title by bluetooth state
* Enable bluetooth discoverable mode in Connected device page
* Add more test cases for DiscoverableFooterPreferenceController
Bug:
79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
Merged-In: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
timhypeng [Fri, 11 May 2018 06:38:22 +0000 (14:38 +0800)]
Add bluetooth discoverable footer preference in connected devices page
* Dynamicly add preference in controller
* Add test cases for DiscoverableFooterPreferenceController
Bug:
79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
Merged-In: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
Lei Yu [Mon, 21 May 2018 20:15:24 +0000 (13:15 -0700)]
When restrict, use uid inside AppInfo
Before this CL, we use packageManager to get uid for battery
restriction. However it may not be correct all the time.
For example, RestrictedAppDetails will be opened as main user
however inside we also show work profile apps, in this case
we can't get correct uid by only using normal API in PackageManager.
This CL change it to use uid from AppInfo, which is correct all
the time.
Bug:
79992590
Test: RunSettingsRoboTests
Change-Id: Id33a5f6409d6bace0d756e5ac06432acb8b2cf65
hughchen [Wed, 16 May 2018 09:12:29 +0000 (17:12 +0800)]
Dynamically showing "driving mode"
Dynamically showing "driving mode" in "Connection preferences" summary.
In cl/
196700988, when driving mode is available/not available will using
Settings.System to set flag.
Example :
driving mode is available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 1)
driving mode is not available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 0);
This CL using Settings.System to get driving mode state that used to dynamically
showing "driving mode"
Bug:
79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I702fa4fbc752c7b470184cf58f2e604f9f28c057
Merged-In: I702fa4fbc752c7b470184cf58f2e604f9f28c057
Lei Yu [Tue, 22 May 2018 01:42:56 +0000 (18:42 -0700)]
[automerger skipped] Merge "Add action log in "Restrict app page"." into pi-dev am:
8075586a2e
am:
cc7b1cf5f2 -s ours
Change-Id: I9aeeaeef4b958a6fac1da54fe5205bb706273fb1
Lei Yu [Tue, 22 May 2018 01:39:23 +0000 (18:39 -0700)]
Merge "Add action log in "Restrict app page"." into pi-dev
am:
8075586a2e
Change-Id: Ie4387d9d5cc05742b26bda9bcd27eca49755809e
TreeHugger Robot [Tue, 22 May 2018 01:32:14 +0000 (01:32 +0000)]
Merge "Add action log in "Restrict app page"." into pi-dev
tim peng [Tue, 22 May 2018 01:23:34 +0000 (01:23 +0000)]
Merge changes from topic "BT_Discoverable_in_Connected_Devices"
* changes:
Make device discoverable in Connected Devices settings page
Add bluetooth discoverable footer preference in connected devices page
Lei Yu [Fri, 18 May 2018 21:12:55 +0000 (14:12 -0700)]
Add action log in "Restrict app page".
This CL adds confirmation dialog in "Restrict app page". By go through
BatteryTipDialogFragment, it will find the correct action, in which
we already have log:
1. RestrictAppAction
2. UnRestrictAppAction
Bug:
79992590
Test: RunSettingsRoboTests
Change-Id: I179fbd17a012528fdfacf42e4a93943eaefff23d
Merged-In: I179fbd17a012528fdfacf42e4a93943eaefff23d
TreeHugger Robot [Tue, 22 May 2018 00:34:35 +0000 (00:34 +0000)]
Merge "Add action log in "Restrict app page"."
Antony Sargent [Mon, 21 May 2018 23:42:11 +0000 (16:42 -0700)]
Update music, notifications, device information, and movies icons
Also delete duplicated ic_settings_notifications.xml and point existing
usages to ic_notifications.xml
Bug:
77982107
Test: manual
Change-Id: Ia7896598c6334aa97faf392b17e6bc3c17d58599
TreeHugger Robot [Mon, 21 May 2018 23:40:29 +0000 (23:40 +0000)]
Merge "Misc GAR fixes"
Lei Yu [Fri, 18 May 2018 21:12:55 +0000 (14:12 -0700)]
Add action log in "Restrict app page".
This CL adds confirmation dialog in "Restrict app page". By go through
BatteryTipDialogFragment, it will find the correct action, in which
we already have log:
1. RestrictAppAction
2. UnRestrictAppAction
Bug:
79992590
Test: RunSettingsRoboTests
Change-Id: I179fbd17a012528fdfacf42e4a93943eaefff23d
Matthew Fritze [Thu, 17 May 2018 18:27:46 +0000 (11:27 -0700)]
Fix availability status for AOD gestures
Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.
Test: robotests
Change-Id: Ib246070ee853185459628b2584ddbae72e15a2f8
Fan Zhang [Mon, 21 May 2018 19:07:28 +0000 (12:07 -0700)]
Misc GAR fixes
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.
Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes:
79773433
Test: robotests
Test: visual
Fan Zhang [Mon, 21 May 2018 19:07:28 +0000 (12:07 -0700)]
Misc GAR fixes
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.
Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes:
79773433
Test: robotests
Test: visual
TreeHugger Robot [Mon, 21 May 2018 22:18:57 +0000 (22:18 +0000)]
Merge "styleActionBar when updating header"
TreeHugger Robot [Mon, 21 May 2018 22:18:53 +0000 (22:18 +0000)]
Merge "Set click listeners on displayPreference"
Matthew Fritze [Thu, 17 May 2018 18:27:46 +0000 (11:27 -0700)]
Fix availability status for AOD gestures
Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.
Test: robotests
Change-Id: Ib3f40c38bb210d0f512736746dc45a1b844c6bee
Merged-In: Ib246070ee853185459628b2584ddbae72e15a2f8
Fixes:
79779562
Matthew Fritze [Mon, 21 May 2018 21:49:39 +0000 (14:49 -0700)]
Merge "Change Night Display slice title to "NightDisplay"" into pi-dev am:
fbe8e0f11e
am:
29365aa2e7
Change-Id: Ifbe37d928fa60f560adbb971a07bb699b9777bab
Matthew Fritze [Mon, 21 May 2018 21:47:19 +0000 (14:47 -0700)]
Merge "Change Night Display slice title to "NightDisplay"" into pi-dev
am:
fbe8e0f11e
Change-Id: I5e5659e629761631aaaa81e2f5e84a048339acee
TreeHugger Robot [Mon, 21 May 2018 21:37:38 +0000 (21:37 +0000)]
Merge "Change Night Display slice title to "NightDisplay"" into pi-dev
Beverly [Mon, 21 May 2018 21:08:57 +0000 (14:08 -0700)]
[automerger skipped] DO NOT MERGE styleActionBar when updating header am:
77b5986032
am:
0e35a49546 -s ours
Change-Id: I3d2a8a59965ab4f06f5d0303f7c3bda71af90907
Beverly [Mon, 21 May 2018 21:00:52 +0000 (14:00 -0700)]
DO NOT MERGE styleActionBar when updating header
am:
77b5986032
Change-Id: Ibe961b91bdefe789e83015f3111aaaf6b8986ee0
Beverly [Mon, 21 May 2018 17:27:09 +0000 (13:27 -0400)]
styleActionBar when updating header
Cherry-picked from pi-dev
If the activity has started, style the actionBar when the
header is being updated
Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Fixes:
79983080
Matthew Fritze [Mon, 21 May 2018 20:36:45 +0000 (13:36 -0700)]
Change Night Display slice title to "NightDisplay"
Fixes:
80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
Beverly [Mon, 21 May 2018 17:27:09 +0000 (13:27 -0400)]
DO NOT MERGE styleActionBar when updating header
If the activity has started, style the actionBar when the
header is being updated
Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Bug:
79983080
TreeHugger Robot [Mon, 21 May 2018 17:38:18 +0000 (17:38 +0000)]
Merge "Dynamically showing "driving mode""
Beverly [Fri, 18 May 2018 18:33:36 +0000 (14:33 -0400)]
Set click listeners on displayPreference
Cherry-picked from pi-dev
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Fixes:
79728671
Beverly [Mon, 21 May 2018 14:48:41 +0000 (07:48 -0700)]
Merge "Don't give onboarding dialog a fixed width" into pi-dev am:
c4929ccc19
am:
cacd84c669
Change-Id: I83391213e8382269190dbb83ff5d405616db5c17
Beverly [Mon, 21 May 2018 14:36:41 +0000 (07:36 -0700)]
Merge "Don't give onboarding dialog a fixed width" into pi-dev
am:
c4929ccc19
Change-Id: Id3a296b4daad2dd2353ae31a3a91bea720a1ec47
TreeHugger Robot [Mon, 21 May 2018 14:20:12 +0000 (14:20 +0000)]
Merge "Don't give onboarding dialog a fixed width" into pi-dev
Beverly Tai [Mon, 21 May 2018 14:03:52 +0000 (07:03 -0700)]
Merge "Update DND strings" into pi-dev am:
c5ac30d1c7
am:
a1397786fb
Change-Id: I4b16109b29be4f88a7bb424ce28ede8c562e3cae
Beverly Tai [Mon, 21 May 2018 13:59:21 +0000 (06:59 -0700)]
Merge "Update DND strings" into pi-dev
am:
c5ac30d1c7
Change-Id: Iec145e7fb343812dba25fccdb9b4ca48aa67641e
Beverly Tai [Mon, 21 May 2018 13:51:10 +0000 (13:51 +0000)]
Merge "Update DND strings" into pi-dev
OSDN Git Service
