OSDN Git Service
Bill Yi [Fri, 1 Jun 2018 18:19:28 +0000 (11:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8c56825ecd -s ours
Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa
Bill Yi [Fri, 1 Jun 2018 05:05:33 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
Ryan Lin [Fri, 1 Jun 2018 00:16:12 +0000 (17:16 -0700)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
am:
942b07da93
Change-Id: I9977e19cc055effe3c9ce91a2665462957a97481
Ryan Lin [Thu, 31 May 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
Beverly [Thu, 31 May 2018 21:24:11 +0000 (14:24 -0700)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev
am:
fa01fcb2c9
Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
Matthew Fritze [Thu, 31 May 2018 18:37:19 +0000 (11:37 -0700)]
Merge "Make Settings Slider Slices one row" into pi-dev
am:
4199198ec2
Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
TreeHugger Robot [Thu, 31 May 2018 18:12:00 +0000 (18:12 +0000)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Make Settings Slider Slices one row" into pi-dev
Beverly [Fri, 25 May 2018 19:04:16 +0000 (15:04 -0400)]
No need for "and" - ListFormatter adds it
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes:
80303010
ryanywlin [Thu, 31 May 2018 01:37:20 +0000 (09:37 +0800)]
Handle Bluetooth is not supported on emulator
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor
Bug:
80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
Matthew Fritze [Wed, 30 May 2018 22:39:43 +0000 (15:39 -0700)]
Make Settings Slider Slices one row
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.
Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes:
80430118
Test: robotests
Hansong Zhang [Wed, 30 May 2018 20:59:15 +0000 (13:59 -0700)]
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d am:
48aa959b14 am:
7cc441bf2f -s ours
am:
acfbc0eff4
Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
Hansong Zhang [Wed, 30 May 2018 20:41:41 +0000 (13:41 -0700)]
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d am:
48aa959b14
am:
7cc441bf2f -s ours
Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
Hansong Zhang [Wed, 30 May 2018 20:32:52 +0000 (13:32 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d
am:
48aa959b14
Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
am:
e36ca3e96d
Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
Hansong Zhang [Wed, 30 May 2018 17:41:35 +0000 (10:41 -0700)]
Merge "Give PBAP permission only after user confirms" into pi-dev
am:
fcac34d723
Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653
TreeHugger Robot [Wed, 30 May 2018 17:35:57 +0000 (17:35 +0000)]
Merge "Give PBAP permission only after user confirms" into pi-dev
Fan Zhang [Wed, 30 May 2018 03:20:55 +0000 (20:20 -0700)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
am:
cf2e1fd593
Change-Id: I7d3b2321d9cc3c44dea3738596104df2e43cb1f3
TreeHugger Robot [Wed, 30 May 2018 03:08:20 +0000 (03:08 +0000)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
Fan Zhang [Wed, 30 May 2018 01:01:02 +0000 (18:01 -0700)]
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
am:
ce7d1ab3bb
Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a
TreeHugger Robot [Wed, 30 May 2018 00:18:45 +0000 (00:18 +0000)]
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
Fan Zhang [Tue, 29 May 2018 18:14:42 +0000 (11:14 -0700)]
Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes:
76435804
Test: robotests
Fan Zhang [Fri, 25 May 2018 21:59:40 +0000 (14:59 -0700)]
Prevent disabling default phone/sms apps in battery setting
- In handleDisableable(), call getKeepEnabledPackages() in the same way
as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
app packages.
Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes:
80328396
Bug:
80312809
Test: robotests
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
Give PBAP permission only after user confirms
Bug:
72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
Matthew Fritze [Tue, 29 May 2018 19:51:39 +0000 (12:51 -0700)]
Merge "Fix bluetooth search result no-op" into pi-dev
am:
f14bfcbfa6
Change-Id: Ie4340134a533c9dcd3293e5fc4f7d5d14fb5a3bb
TreeHugger Robot [Tue, 29 May 2018 19:40:14 +0000 (19:40 +0000)]
Merge "Fix bluetooth search result no-op" into pi-dev
Fan Zhang [Tue, 29 May 2018 19:06:31 +0000 (12:06 -0700)]
Merge "Fix a bug where device index is not skipped correct." into pi-dev
am:
75b3e6f302
Change-Id: Ifba1a52d5f9a3d3ca69a13ef769d22f0bf1402f9
Matthew Fritze [Tue, 29 May 2018 19:05:33 +0000 (12:05 -0700)]
Merge "Fix DND crash from SpringboardActivity" into pi-dev
am:
3f790b76b0
Change-Id: I310c86c8ca308e7e71d22441774bf8ce036b4ddb
Antony Sargent [Tue, 29 May 2018 19:04:21 +0000 (12:04 -0700)]
Merge "Another refresh of swipe up gesture video" into pi-dev
am:
d87ce094cd
Change-Id: Icd8df823edcd90220f8173013e019642ac5df554
TreeHugger Robot [Tue, 29 May 2018 18:48:24 +0000 (18:48 +0000)]
Merge "Fix a bug where device index is not skipped correct." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:47:23 +0000 (18:47 +0000)]
Merge "Fix DND crash from SpringboardActivity" into pi-dev
Matthew Fritze [Tue, 29 May 2018 18:38:52 +0000 (11:38 -0700)]
Fix bluetooth search result no-op
Bluetooth fragment was manually setting intent information,
which meant that the result didn't fire an intent properly.
This type of regression or mistake will be caught in the fix for
b/
77921040.
Change-Id: I49f87f40acbfc3f74ea2e97835f2644d443169e2
Fixes:
80317645
Test: robotests
TreeHugger Robot [Tue, 29 May 2018 18:34:23 +0000 (18:34 +0000)]
Merge "Another refresh of swipe up gesture video" into pi-dev
Michael Wright [Sat, 26 May 2018 02:12:31 +0000 (19:12 -0700)]
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
am:
8c60fc69b7
Change-Id: I036caa9e233f74c71c2dddef9e58c036b250a968
TreeHugger Robot [Sat, 26 May 2018 02:03:09 +0000 (02:03 +0000)]
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
Alexey Kuzmin [Sat, 26 May 2018 01:04:18 +0000 (18:04 -0700)]
Merge "Add vibration preview" into pi-dev
am:
1ec06d4623
Change-Id: I41ca4015889a7c0af9767d4726e852275a388d26
TreeHugger Robot [Sat, 26 May 2018 00:58:16 +0000 (00:58 +0000)]
Merge "Add vibration preview" into pi-dev
Michael Wright [Sat, 26 May 2018 00:28:35 +0000 (17:28 -0700)]
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
am:
76e0cb6678
Change-Id: I02c1b2451ad75b9a10b2e7bd83089cfd1a5c9c94
TreeHugger Robot [Sat, 26 May 2018 00:20:44 +0000 (00:20 +0000)]
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
Fan Zhang [Fri, 25 May 2018 23:05:58 +0000 (16:05 -0700)]
Fix a bug where device index is not skipped correct.
When checking language/build fingerprint to skip reindex, language check
was comparing Locale object and String object, so they would never be
equal, so we accidentally reindex every time.
- Switched Objects.equal to TextUtils.equal, this catches the error at
compiler level.
Bug:
80065409
Test: compile/robotest
Change-Id: I2b3c68bb1c2fd876338f42321605567d7e64d64b
Michael Wright [Fri, 25 May 2018 22:37:29 +0000 (23:37 +0100)]
Add michaelwr to OWNERS for haptics settings in accessibility
Bug:
80243632
Test: N/A
Change-Id: Id315d626af527946230affc292ed9b329efe8b5b
Michael Wright [Fri, 25 May 2018 21:57:03 +0000 (22:57 +0100)]
Hide haptic intensity settings for devices without enough dynamic range.
Despite our hope, devices prior to P18 just don't have the dynamic range
to give three distinct vibration intensity settings. Given this, only
show an on / off toggle for devices by default unless they explicitly
opt-in to multiple intensity levels.
Test: m -j RunSettingsRoboTests
Bug:
80243632
Change-Id: I14ece855cf20f9fa44b0648d28f89c0053be5c5f
Antony Sargent [Fri, 25 May 2018 21:42:14 +0000 (14:42 -0700)]
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
am:
e4999751ab
Change-Id: I812a58e2a0fead5b9a1eec9e9cf1b2383de1321d
TreeHugger Robot [Fri, 25 May 2018 21:35:23 +0000 (21:35 +0000)]
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
Matthew Fritze [Thu, 24 May 2018 23:09:05 +0000 (16:09 -0700)]
Fix DND crash from SpringboardActivity
Special case Uris need to explicitly add their intents.
This unfortunately duplicates a list of special-cased Slices,
but I have attached a bug with a plan to address this duplicity in Q.
Change-Id: I346915c32543713d33716422018d7c950cce323d
Fixes:
80065409
Test: atest SliceDeepLinkSpringBoardTest
Antony Sargent [Fri, 25 May 2018 19:52:24 +0000 (12:52 -0700)]
Remove Advanced dropdown from "About phone" screen
All the items will appear in the list instead of hiding some under an Advanced
dropdown.
Bug:
80302533
Test: manual (Settings->System->About phone)
Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
Antony Sargent [Fri, 25 May 2018 20:00:10 +0000 (13:00 -0700)]
Another refresh of swipe up gesture video
Bug:
77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I62c46ef38cf67b4bf200ad2420138fe6677d6999
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
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
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 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: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
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
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
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
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
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
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
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
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
OSDN Git Service
