OSDN Git Service
TreeHugger Robot [Fri, 25 May 2018 21:08:13 +0000 (21:08 +0000)]
Merge "Remove OverlayManagerWrapper class out from Settings"
Ching-Sung Li [Fri, 18 May 2018 03:56:49 +0000 (11:56 +0800)]
Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I0bddf50d8ea7721fe258a9a9b51f8c56dd5afcce
Fan Zhang [Fri, 25 May 2018 19:53:57 +0000 (12:53 -0700)]
[automerger skipped] Merge "2nd attempt to fix Slice strict mode." into pi-dev am:
7d214f99ee
am:
5c688f3eae -s ours
Change-Id: I829a50c864c978bd3cf03dff925676e2bf7d4b46
Fan Zhang [Fri, 25 May 2018 19:49:29 +0000 (12:49 -0700)]
Merge "2nd attempt to fix Slice strict mode." into pi-dev
am:
7d214f99ee
Change-Id: If0e5bec4bc187f4e77848a1af2fd861f8bb7cbdb
TreeHugger Robot [Fri, 25 May 2018 19:44:32 +0000 (19:44 +0000)]
Merge "2nd attempt to fix Slice strict mode." into pi-dev
TreeHugger Robot [Fri, 25 May 2018 18:41:28 +0000 (18:41 +0000)]
Merge "2nd attempt to fix Slice strict mode."
Fan Zhang [Thu, 24 May 2018 17:10:02 +0000 (10:10 -0700)]
2nd attempt to fix Slice strict mode.
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Bug:
79985175
Test: robotests
Matthew Fritze [Fri, 25 May 2018 17:06:14 +0000 (10:06 -0700)]
[automerger skipped] Merge "Add remaining whitelisted controllers" into pi-dev am:
da07a66365
am:
b9d07718d5 -s ours
Change-Id: Ia5716209c19f1868b6364c8f585c28942d3b3072
Matthew Fritze [Fri, 25 May 2018 17:02:14 +0000 (10:02 -0700)]
Merge "Add remaining whitelisted controllers" into pi-dev
am:
da07a66365
Change-Id: I1b4a9e25da8138409d20e960dc68a4e8b5b2e459
TreeHugger Robot [Fri, 25 May 2018 16:53:44 +0000 (16:53 +0000)]
Merge "Add remaining whitelisted controllers" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 16:47:57 +0000 (16:47 +0000)]
Merge "Add remaining whitelisted controllers"
Fan Zhang [Thu, 24 May 2018 17:10:02 +0000 (10:10 -0700)]
2nd attempt to fix Slice strict mode.
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Merged-In: I68523148f4c1dc88a54e207447d21ec439478cdf
Fixes:
79985175
Test: robotests
Fan Zhang [Fri, 25 May 2018 16:03:55 +0000 (09:03 -0700)]
[automerger skipped] Merge "Update storage header background to colorPrimary" into pi-dev am:
5431191163
am:
a8c2602987 -s ours
Change-Id: If8735596b6441e6c8657ca345c911ddca485d96c
Fan Zhang [Fri, 25 May 2018 15:59:26 +0000 (08:59 -0700)]
Merge "Update storage header background to colorPrimary" into pi-dev
am:
5431191163
Change-Id: I0163a02a193e3084c7a903e69da0b37a9afa1061
Fan Zhang [Fri, 25 May 2018 15:49:59 +0000 (15:49 +0000)]
Merge "Update storage header background to colorPrimary" into pi-dev
Matthew Fritze [Fri, 25 May 2018 15:13:12 +0000 (08:13 -0700)]
[automerger skipped] Merge "Make summary text update after settings changes" into pi-dev am:
b915f3566b
am:
bee0516dfe -s ours
Change-Id: Ibadb731396a1665f736764a8f6dc22cbb5bd67a7
Matthew Fritze [Fri, 25 May 2018 15:09:13 +0000 (08:09 -0700)]
Merge "Make summary text update after settings changes" into pi-dev
am:
b915f3566b
Change-Id: I17d63173b63f39acf6bada648a15dc86b1000ce2
TreeHugger Robot [Fri, 25 May 2018 15:01:26 +0000 (15:01 +0000)]
Merge "Make summary text update after settings changes" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 14:52:59 +0000 (14:52 +0000)]
Merge "Make summary text update after settings changes"
Jason Monk [Fri, 25 May 2018 06:51:44 +0000 (23:51 -0700)]
Merge "Follow SliceManager API changes" into pi-dev am:
d68ed5c92c
am:
667d662d85
Change-Id: I42f6774aed0638e9c6574c0f5332c3c235ac07f2
Chihhang Chuang [Fri, 25 May 2018 06:51:04 +0000 (23:51 -0700)]
[automerger skipped] Merge "Refactor nfc preference controller" into pi-dev am:
2357c1cd84
am:
6c1c1a6a50 -s ours
Change-Id: I1b904418b7e704f2cfb3545740c0954b86026b30
Antony Sargent [Fri, 25 May 2018 06:50:12 +0000 (23:50 -0700)]
Merge "Update sound settings icons" into pi-dev am:
2e0709b3b8
am:
75ffd61ee3
Change-Id: I60c903d44a89e09eadd469d67d6351efcb2b9721
Antony Sargent [Fri, 25 May 2018 06:49:40 +0000 (23:49 -0700)]
Merge "Refresh several icons" into pi-dev am:
642e63c2e0
am:
ef75735861
Change-Id: I73ccb073d5c239b454d142ecc800007bce23d626
Antony Sargent [Fri, 25 May 2018 06:49:07 +0000 (23:49 -0700)]
Merge "Refresh system update icon" into pi-dev am:
efc2cb0492
am:
30c39c273c
Change-Id: I355f80233f669939ac7a1b70aaf2fc3d5b562fcf
Lei Yu [Fri, 25 May 2018 06:48:36 +0000 (23:48 -0700)]
Merge "Update icon for battery saver conditon." into pi-dev am:
89e0287711
am:
4c39b05ad7
Change-Id: Id969c2685ca51086f412f46eaa3f89834710c1ad
Lucas Dupin [Fri, 25 May 2018 06:48:03 +0000 (23:48 -0700)]
[automerger skipped] Merge "Setting to change sysui theme" into pi-dev am:
7179206395
am:
c7a226c27a -s ours
Change-Id: I3d1ca4445c8ad50b04debd4728825b176787c1b9
Antony Sargent [Fri, 25 May 2018 06:47:23 +0000 (23:47 -0700)]
Merge "Refresh battery status icons" into pi-dev am:
64379a08f7
am:
bc375150de
Change-Id: Id2036d35540a5d2498f7484e3d7ac30804f9d2e3
Antony Sargent [Fri, 25 May 2018 06:46:36 +0000 (23:46 -0700)]
Merge "Updated misc. settings icon" into pi-dev am:
c3d2e78d82
am:
7e62c0bffa
Change-Id: If8a0a46062e8426cd90178b2e39aa8c9c0c24454
Petri Gynther [Fri, 25 May 2018 06:46:01 +0000 (23:46 -0700)]
Merge "Set default value of A2DP HW offload toggle" into pi-dev am:
d6acb081af
am:
6cc221169b
Change-Id: Ia6097eeec41c0d19b06ce01db136e208a4cb6ebb
Jason Monk [Fri, 25 May 2018 02:04:31 +0000 (19:04 -0700)]
Merge "Follow SliceManager API changes" into pi-dev
am:
d68ed5c92c
Change-Id: Ice176c79605250c263a21cbc624b438902dfaedc
Jason Monk [Fri, 25 May 2018 01:21:35 +0000 (01:21 +0000)]
Merge "Follow SliceManager API changes" into pi-dev
Chihhang Chuang [Thu, 24 May 2018 23:35:26 +0000 (16:35 -0700)]
Merge "Refactor nfc preference controller" into pi-dev
am:
2357c1cd84
Change-Id: I82c793a393ec8bd92f409743173ec79a8ba0387b
Antony Sargent [Thu, 24 May 2018 23:31:15 +0000 (16:31 -0700)]
Merge "Update sound settings icons" into pi-dev
am:
2e0709b3b8
Change-Id: Ic6f6658698e824b4eb99799b5c5146c3311a99d4
Antony Sargent [Thu, 24 May 2018 23:18:05 +0000 (16:18 -0700)]
Merge "Refresh several icons" into pi-dev
am:
642e63c2e0
Change-Id: I2487a06fb681680209dd5b37b7b6f376bb2d6640
Antony Sargent [Thu, 24 May 2018 23:06:22 +0000 (16:06 -0700)]
Merge "Refresh system update icon" into pi-dev
am:
efc2cb0492
Change-Id: Ie611915fc682d75201655c4308c3e7ba71953910
TreeHugger Robot [Thu, 24 May 2018 21:44:50 +0000 (21:44 +0000)]
Merge "Fix a NPE when highlighting fingerprint row."
Lei Yu [Thu, 24 May 2018 20:56:57 +0000 (13:56 -0700)]
Merge "Update icon for battery saver conditon." into pi-dev
am:
89e0287711
Change-Id: If5b81203ee4cbf691b236f79f71213f8252ac873
Lucas Dupin [Thu, 24 May 2018 20:39:19 +0000 (13:39 -0700)]
Merge "Setting to change sysui theme" into pi-dev
am:
7179206395
Change-Id: I34f0fa82b9b9ebb9d6ba7707363a5b948c9f0421
Matthew Fritze [Wed, 23 May 2018 20:03:27 +0000 (13:03 -0700)]
Make summary text update after settings changes
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Change-Id: I4d04642bc80b97c5191bf0e1e7a5e15a2c58d6c9
Merged-In: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
Fixes:
79779837
Test: robotest
Matthew Fritze [Wed, 23 May 2018 20:03:27 +0000 (13:03 -0700)]
Make summary text update after settings changes
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Bug:
79779837
Test: robotest
Change-Id: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
Fan Zhang [Thu, 24 May 2018 16:45:24 +0000 (09:45 -0700)]
Update storage header background to colorPrimary
Change-Id: I07f78cc6452846829b92d25fe9c41c6efe40a459
Merged-In: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
Fixes:
79773433
Test: visual
TreeHugger Robot [Thu, 24 May 2018 17:45:19 +0000 (17:45 +0000)]
Merge "Refactor nfc preference controller" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:55:11 +0000 (14:55 -0700)]
Add remaining whitelisted controllers
Because I missed them in the long whitelist the first time...
Change-Id: I9fbd7b33e06b3f2f6e5e5778f78abfdb1a52006a
Merged-In: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
Fixes:
79779103
Test: robotests
Matthew Fritze [Wed, 23 May 2018 21:55:11 +0000 (14:55 -0700)]
Add remaining whitelisted controllers
Because I missed them in the long whitelist the first time...
Bug:
79779103
Test: robotests
Change-Id: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
Antony Sargent [Thu, 24 May 2018 06:12:50 +0000 (06:12 +0000)]
Merge "Update sound settings icons" into pi-dev
Antony Sargent [Thu, 24 May 2018 06:11:57 +0000 (06:11 +0000)]
Merge "Refresh several icons" into pi-dev
Antony Sargent [Thu, 24 May 2018 06:09:22 +0000 (06:09 +0000)]
Merge "Refresh system update icon" into pi-dev
Lei Yu [Thu, 24 May 2018 05:12:28 +0000 (05:12 +0000)]
Merge "Update icon for battery saver conditon." into pi-dev
Julia Reynolds [Thu, 24 May 2018 02:32:43 +0000 (19:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev am:
718c344daf
am:
db581cb3d4 -s ours
Change-Id: I016f444e1edc45973698901f02450327218e5303
Chihhang Chuang [Thu, 29 Mar 2018 09:26:04 +0000 (17:26 +0800)]
Refactor nfc preference controller
- Remove BaseNfcPreferenceController.
- NfcPreferenceController inherit from TogglePreferenceController.
- AndroidBeamPreferenceController inherit from BasePreferenceController.
- Override getIntentFilter in NfcPreferenceController to listen changes.
- Add an API (hasAsyncUpdate) into BasePreferenceController to
distinguish the setting which is updated asynchronously.
Change-Id: I1abe4410169e305a0d6106e24c54e7f2e763fc91
Merged-In: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes:
67997761
Fixes:
74887543
Test: RunSettingsRoboTests
Lucas Dupin [Thu, 24 May 2018 02:15:03 +0000 (02:15 +0000)]
Merge "Setting to change sysui theme" into pi-dev
Antony Sargent [Thu, 24 May 2018 01:49:06 +0000 (18:49 -0700)]
Merge "Refresh battery status icons" into pi-dev
am:
64379a08f7
Change-Id: Ief175d64ec2dad05d188ed9aa12cfaf0b74c4758
Antony Sargent [Thu, 24 May 2018 01:38:40 +0000 (18:38 -0700)]
Merge "Updated misc. settings icon" into pi-dev
am:
c3d2e78d82
Change-Id: Ie61946bfa07c093748a5c4553988d6f1f87c1ef3
Petri Gynther [Thu, 24 May 2018 01:09:27 +0000 (18:09 -0700)]
Merge "Set default value of A2DP HW offload toggle" into pi-dev
am:
d6acb081af
Change-Id: I2b39c0b17613fafd88954505bf1d982dcc55014b
TreeHugger Robot [Thu, 24 May 2018 01:04:53 +0000 (01:04 +0000)]
Merge "Refresh battery status icons" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 01:03:50 +0000 (01:03 +0000)]
Merge "Updated misc. settings icon" into pi-dev
Petri Gynther [Wed, 23 May 2018 23:59:19 +0000 (23:59 +0000)]
Merge "Set default value of A2DP HW offload toggle" into pi-dev
Antony Sargent [Wed, 23 May 2018 17:15:21 +0000 (10:15 -0700)]
Refresh system update icon
Bug:
77982107
Test: manual
Change-Id: Ifad137b464fce62cbba0f456da4a773f556a1004
Antony Sargent [Wed, 23 May 2018 17:15:21 +0000 (10:15 -0700)]
Refresh several icons
This CL includes the following:
-account
-backup
-display
-folder
-location
-multiuser
-security
Bug:
77982107
Test: manual
Change-Id: I921e20d100bf4b3cb4af7326a5aac2b4e5629196
TreeHugger Robot [Wed, 23 May 2018 23:22:15 +0000 (23:22 +0000)]
Merge "Setting to change sysui theme"
Julia Reynolds [Wed, 23 May 2018 23:11:08 +0000 (16:11 -0700)]
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
am:
718c344daf
Change-Id: Ib539d391b3517e9281337a5ba3972bd8ca21caf1
Jayachandran Chinnakkannu [Wed, 23 May 2018 23:08:46 +0000 (16:08 -0700)]
[automerger skipped] Merge "Remove connectivity monitor switch from developer options" into pi-dev am:
8d7ccc0074
am:
433cca7577 -s ours
Change-Id: Ia9177fc830d5f99ea2c9ace03a88ab62525c3642
Matthew Fritze [Wed, 23 May 2018 23:06:57 +0000 (16:06 -0700)]
Merge "Hook up blocked keys" into pi-dev am:
a60ea38f67
am:
a8e1a02bfa
Change-Id: Ib79a5fe4721086f400477dc159e14ab5e641e304
Matthew Fritze [Wed, 23 May 2018 23:06:19 +0000 (16:06 -0700)]
[automerger skipped] Merge "Inline slider with header" into pi-dev am:
666ee4fa14
am:
dc001563ae -s ours
Change-Id: I57208dd70a098e15792b339ea6353ee218ab67eb
Julia Reynolds [Wed, 23 May 2018 23:05:38 +0000 (16:05 -0700)]
Merge "Use standard displayPreference" into pi-dev am:
eba0723a57
am:
b7bfb04f50
Change-Id: I8f6704247d5e633cc1d6cd3d75403837606fca03
Daichi Ueura [Wed, 23 May 2018 23:05:02 +0000 (16:05 -0700)]
Merge "Hide entire hidden field for non-hidden networks" into pi-dev am:
2c793dfeff
am:
1a2153e6ab
Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
Fan Zhang [Wed, 23 May 2018 23:04:20 +0000 (16:04 -0700)]
[automerger skipped] Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev am:
87dfe60ad0
am:
b82d639f34 -s ours
Change-Id: I6970932b5536ee4938e20802ce8041295b4923d7
Matthew Fritze [Wed, 23 May 2018 23:03:41 +0000 (16:03 -0700)]
[automerger skipped] Merge "Return null when setting can't be changed." into pi-dev am:
c7b90ee998
am:
9c49a3a20d -s ours
Change-Id: I14fa7dc962384c564ad9ff1c96528b40b7bbb31b
Matthew Fritze [Wed, 23 May 2018 23:02:53 +0000 (16:02 -0700)]
[automerger skipped] Merge "Add Location Slice" into pi-dev am:
53f6b7cb06
am:
b8b2c0c265 -s ours
Change-Id: If6e5d2770bc799232342be8a1103c94fdb5f1914
Matthew Fritze [Wed, 23 May 2018 23:02:00 +0000 (16:02 -0700)]
Merge "Clear indexing before adding all Slices" into pi-dev am:
842ea91baa
am:
6f8bfd5fec
Change-Id: I4a56f4af28b980480c17b4de918b3aeb052f40e5
Antony Sargent [Wed, 23 May 2018 23:01:21 +0000 (16:01 -0700)]
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev am:
e0e49140d2
am:
107242f7b1
Change-Id: I386a9b1902a36f7cc16ec0bd8e773de6678d8516
Antony Sargent [Wed, 23 May 2018 23:00:31 +0000 (16:00 -0700)]
Merge "Update storage, videogame, and vpn icons" into pi-dev am:
28dc3917a9
am:
e3ce1df654
Change-Id: Ic5906d22df49ca2236727c7edcd6192426795fcb
Matthew Fritze [Wed, 23 May 2018 22:59:52 +0000 (15:59 -0700)]
[automerger skipped] Merge "Update airplane mode key to match framework constant" into pi-dev am:
6be5e331cf
am:
73ed33af27 -s ours
Change-Id: I2564e4d3938d9798588ea9ef98c7830e120c24e3
Erik Kline [Wed, 23 May 2018 22:59:09 +0000 (15:59 -0700)]
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev am:
5a0a7ef4bb
am:
cf83539e1e
Change-Id: Ia06f5bef6d4103cf65a2c07d8dadecfa815080f7
Antony Sargent [Wed, 23 May 2018 22:34:01 +0000 (15:34 -0700)]
Update sound settings icons
In several places we were referencing private icons from
frameworks/base/core instead of versions we already had in
settings. Also add in a "media stream off" icon to match the one we
already had for "media stream on".
Bug:
77982107
Test: manual (Settings->Sound, then use hardware controls to modify
media and ring volumes)
Change-Id: I3a1d808b3028bb4f2feae4536194dc58c3177a66
Lucas Dupin [Tue, 22 May 2018 21:27:40 +0000 (14:27 -0700)]
Setting to change sysui theme
Users now can manually pick if they want light or dark QS
and launcher
Change-Id: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes:
63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
Jayachandran Chinnakkannu [Wed, 23 May 2018 22:12:55 +0000 (15:12 -0700)]
Merge "Remove connectivity monitor switch from developer options" into pi-dev
am:
8d7ccc0074
Change-Id: Ic68439308f7d591595876488afa76e57b9414089
Lei Yu [Wed, 23 May 2018 21:54:01 +0000 (14:54 -0700)]
Update icon for battery saver conditon.
To make it consistent with quick settings and battery settings.
Change-Id: I990692b53ee87805d92b93cc874f371e0512154e
Fixes:
80157879
Test: Screenshot
Lucas Dupin [Tue, 22 May 2018 21:27:40 +0000 (14:27 -0700)]
Setting to change sysui theme
Users now can manually pick if they want light or dark QS
and launcher
Change-Id: Iaabdb32d9af6a293dfbd5ba6dea3da1d38a13ad3
Merged-In: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes:
63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
TreeHugger Robot [Wed, 23 May 2018 21:49:56 +0000 (21:49 +0000)]
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:49:32 +0000 (14:49 -0700)]
Merge "Hook up blocked keys" into pi-dev
am:
a60ea38f67
Change-Id: I464e3068051471f05512068bc020866f8d8d8f85
Matthew Fritze [Wed, 23 May 2018 21:48:51 +0000 (14:48 -0700)]
Merge "Inline slider with header" into pi-dev
am:
666ee4fa14
Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe
Julia Reynolds [Wed, 23 May 2018 21:48:08 +0000 (14:48 -0700)]
Merge "Use standard displayPreference" into pi-dev
am:
eba0723a57
Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d
Daichi Ueura [Wed, 23 May 2018 21:47:28 +0000 (14:47 -0700)]
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
am:
2c793dfeff
Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2
Fan Zhang [Wed, 23 May 2018 21:46:45 +0000 (14:46 -0700)]
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
am:
87dfe60ad0
Change-Id: I30f5d13f0c5f430b09585ad2114f0f1ad98eebc9
Matthew Fritze [Wed, 23 May 2018 21:45:58 +0000 (14:45 -0700)]
Merge "Return null when setting can't be changed." into pi-dev
am:
c7b90ee998
Change-Id: I3112475e7cbe477f94c129be78d55b430760df75
Matthew Fritze [Wed, 23 May 2018 21:45:10 +0000 (14:45 -0700)]
Merge "Add Location Slice" into pi-dev
am:
53f6b7cb06
Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3
Matthew Fritze [Wed, 23 May 2018 21:44:03 +0000 (14:44 -0700)]
Merge "Clear indexing before adding all Slices" into pi-dev
am:
842ea91baa
Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412
Antony Sargent [Wed, 23 May 2018 21:43:19 +0000 (14:43 -0700)]
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
am:
e0e49140d2
Change-Id: Ie05b424868cfd46dce36b792a4006dd2cce0aeba
Antony Sargent [Wed, 23 May 2018 21:41:37 +0000 (14:41 -0700)]
Merge "Update storage, videogame, and vpn icons" into pi-dev
am:
28dc3917a9
Change-Id: I7904f669edc41f2d19369a02bb8efdd360d4445f
Matthew Fritze [Wed, 23 May 2018 21:40:55 +0000 (14:40 -0700)]
Merge "Update airplane mode key to match framework constant" into pi-dev
am:
6be5e331cf
Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb
Erik Kline [Wed, 23 May 2018 21:25:29 +0000 (14:25 -0700)]
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
am:
5a0a7ef4bb
Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b
Jason Monk [Wed, 23 May 2018 20:10:11 +0000 (16:10 -0400)]
Follow SliceManager API changes
Test: make
Bug:
78898947
Change-Id: I5a46ccafe36ad2e0fdac745606d9907f07a86d0c
Jayachandran Chinnakkannu [Wed, 23 May 2018 20:57:30 +0000 (20:57 +0000)]
Merge "Remove connectivity monitor switch from developer options" into pi-dev
Julia Reynolds [Mon, 21 May 2018 18:17:26 +0000 (14:17 -0400)]
DO NOT MERGE Handle usageevents for work profile apps
Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes:
79142791
TreeHugger Robot [Wed, 23 May 2018 20:41:22 +0000 (20:41 +0000)]
Merge "Hook up blocked keys" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 20:35:24 +0000 (20:35 +0000)]
Merge "Update phone vibrate icon in condition card."
Fan Zhang [Wed, 23 May 2018 20:21:31 +0000 (13:21 -0700)]
Fix a NPE when highlighting fingerprint row.
If fingerprint pref is not bound to UI yet, then its view is null so we
can't do any ripple animation on it.
Change-Id: I0ccca2dfdb471ab520677c6cd206205230959b27
Fixes:
80147956
Test: manual
Antony Sargent [Wed, 23 May 2018 18:14:08 +0000 (11:14 -0700)]
Refresh battery status icons
Change-Id: I4835c10135a469c61f641879bb09d366160ff612
Fixes:
80152468
Test: manual
TreeHugger Robot [Wed, 23 May 2018 19:32:41 +0000 (19:32 +0000)]
Merge "Inline slider with header" into pi-dev
OSDN Git Service
