OSDN Git Service
Emily Chuang [Wed, 29 Aug 2018 11:47:00 +0000 (19:47 +0800)]
Add conditional cards to the new homepage.
Make existing Settings Conditions show up in the new homepage as custom
view.
Bug:
113451905
Test: robotests
Change-Id: Ic49089f95ff04442a887cda97481e945136f7209
Fan Zhang [Wed, 29 Aug 2018 00:19:53 +0000 (00:19 +0000)]
Merge "Sort imports"
hjchangliao [Tue, 28 Aug 2018 22:36:05 +0000 (15:36 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours am:
e89bf878c6 -s ours
am:
77e838e451 -s ours
Change-Id: Iba46b140281e73cfe82fd462622f6c7e983fdf4c
Colin Cross [Tue, 28 Aug 2018 22:17:41 +0000 (15:17 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master am:
048f11d0a9 -s ours
am:
90184808c1 -s ours
Change-Id: I9adcfe2dfdc6613024c7bba754bd2543e392c556
hjchangliao [Tue, 28 Aug 2018 22:15:25 +0000 (15:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours
am:
e89bf878c6 -s ours
Change-Id: I7e8d43ab2a4c1e735a4e855ce93212b20aa0e858
Android Build Merger (Role) [Tue, 28 Aug 2018 22:14:08 +0000 (22:14 +0000)]
Merge "[automerger skipped] Migrate Settings to androidx. am:
b1af85d155 -s ours am:
44593b7bac -s ours"
Fan Zhang [Tue, 28 Aug 2018 22:11:40 +0000 (15:11 -0700)]
Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Aurimas Liutikas [Tue, 28 Aug 2018 22:12:27 +0000 (15:12 -0700)]
[automerger skipped] Migrate Settings to androidx. am:
b1af85d155 -s ours
am:
44593b7bac -s ours
Change-Id: Ifc73b43625413bb89223875f99d8e0e99b9a2c91
TreeHugger Robot [Tue, 28 Aug 2018 22:08:41 +0000 (22:08 +0000)]
Merge "Turn down app indexing for slices."
hjchangliao [Tue, 28 Aug 2018 22:07:13 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am:
6e2db2c34b -s ours
Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda
Colin Cross [Tue, 28 Aug 2018 22:03:29 +0000 (15:03 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
am:
048f11d0a9 -s ours
Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70
Aurimas Liutikas [Tue, 28 Aug 2018 21:59:45 +0000 (14:59 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
b1af85d155 -s ours
Change-Id: I098cc300a217762bcb77bc1b0b5f6ee6bdbc56dd
Fan Zhang [Tue, 28 Aug 2018 21:55:39 +0000 (14:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours am:
0e05005d8d -s ours
am:
e8bf02f256 -s ours
Change-Id: I4858f230255f0c19a5e7a4ac9ffd0c85841721f1
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours
am:
0e05005d8d -s ours
Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b
Colin Cross [Tue, 28 Aug 2018 21:42:48 +0000 (21:42 +0000)]
Merge "Migrate Settings to androidx." into stage-aosp-master
Fan Zhang [Tue, 28 Aug 2018 21:41:43 +0000 (14:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
am:
56cc4986df -s ours
Change-Id: Iff1f6e189feae17f1166990de31d6f64f920734e
Treehugger Robot [Tue, 28 Aug 2018 21:29:05 +0000 (21:29 +0000)]
Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 20:47:28 +0000 (13:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours am:
6e65a32468 -s ours
am:
9fe69d724d -s ours
Change-Id: If7f67c5a8f32045dd9e1b63f61614b03cfbd9bed
Fan Zhang [Tue, 28 Aug 2018 20:43:08 +0000 (13:43 -0700)]
Turn down app indexing for slices.
Bug:
112587202
Test: robotests
Change-Id: Ice84173bd9617f58689438c460522104776c46ce
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
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: I13a7997b5e21a16ffb723971d267132fbf65e4a6
Aurimas Liutikas [Tue, 28 Aug 2018 19:22:49 +0000 (12:22 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
a290b873d0 -s ours
Change-Id: I9ba23b9406f2f7397de78c86aa3eccf5be4fe22d
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates
- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings
The task affinity is messing with the back stack for this activity when
launched externally
Fixes:
80281932
Fixes:
80290571
Test: manual
Disable uninstall update option for secondary users.
Fixes:
110249550
Test: manual
Suppress some gesture search when there is no hardware
Fixes:
110250839
Test: robotests
Check wifi password length by byte, not char.
Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes:
79209073
Test: robotest
Fan Zhang [Tue, 28 Aug 2018 19:14:58 +0000 (12:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours
am:
6e65a32468 -s ours
Change-Id: Iaf37f20f3ff607c46a66eb278dc17d6998f87984
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
Fan Zhang [Tue, 28 Aug 2018 18:38:27 +0000 (11:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am:
fcaf926dc1 -s ours
Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
TreeHugger Robot [Tue, 28 Aug 2018 18:36:23 +0000 (18:36 +0000)]
Merge "Remove unneeded getDisplayableCards() in DashboardAdapter"
Treehugger Robot [Tue, 28 Aug 2018 18:03:31 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Fix color_lint errors"
Fan Zhang [Tue, 28 Aug 2018 17:26:19 +0000 (10:26 -0700)]
Remove unneeded getDisplayableCards() in DashboardAdapter
It will be called when window gets focus, no need to call it here.
Change-Id: I1c4b3b745edb2519e778f8354684d90e2eb55004
Fixes:
113175600
Test: manual
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE Fix color_lint errors
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
TreeHugger Robot [Tue, 28 Aug 2018 16:02:42 +0000 (16:02 +0000)]
Merge "Clean up the main architecture of Contextual Settings Homepage."
Christine Franks [Tue, 28 Aug 2018 15:45:35 +0000 (15:45 +0000)]
Merge "Remove demo restrictions"
TreeHugger Robot [Tue, 28 Aug 2018 15:04:26 +0000 (15:04 +0000)]
Merge "Updated the CardContentProvider"
TreeHugger Robot [Tue, 28 Aug 2018 14:32:04 +0000 (14:32 +0000)]
Merge "Show bonded devices in "Pair new device"(2/2)"
Emily Chuang [Tue, 28 Aug 2018 10:25:20 +0000 (18:25 +0800)]
Clean up the main architecture of Contextual Settings Homepage.
- Add lifecycle observer in HomepageManager.
- Rename some variables.
Bug:
111676964
Test: robotests
Change-Id: Ic91c53f2c1622d602b3edc664a06a13aa6945f47
Sunny Shao [Mon, 27 Aug 2018 08:58:39 +0000 (16:58 +0800)]
Updated the CardContentProvider
- Removed the availability_uri field
- Changed the card_action data type to integer
- Added the support_half_width field
- Modify the Database version to 2
Bug:
111820446
Test: robotest
Change-Id: I755ad93a05034037bab18e709f53b4af3ce4fe5e
Ash_Chen [Fri, 17 Aug 2018 14:31:41 +0000 (22:31 +0800)]
Show bonded devices in "Pair new device"(2/2)
Some users forgot they had paired devices and couldn't see their BT device
when they search device in "Pair new device". (b/
80382940, b/
80133137).
Need to change the behavior to let paired devices can be shown on "Available devices".
Bug:
111738593
Test: Bluetooth Pairing Test
Change-Id: Ib499785abaa8e4efc1875be113ac87bdbe0c89ba
SongFerng Wang [Tue, 28 Aug 2018 02:40:02 +0000 (02:40 +0000)]
Merge "SIM status page sync signal strength and service state behavior from systemUI"
Christine Franks [Mon, 27 Aug 2018 22:42:58 +0000 (15:42 -0700)]
Remove demo restrictions
These are now available as user restrictions.
Bug:
113298946
Test: make RunSettingsRoboTests -j100
Change-Id: I637083c8edcf43b99cebbf5a7dfd60afee441ade
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
Doris Ling [Mon, 27 Aug 2018 21:11:55 +0000 (14:11 -0700)]
Add log when the advanced button is clicked.
- register the advanced button expand listener and add the metrics log
when it is clicked.
Fixes:
70930626
Test: make RunSettingsRoboTests
Change-Id: Ife4af4bd4a0a8534cf9ba63949660a810b09446a
Bill Yi [Sun, 26 Aug 2018 20:05:18 +0000 (13:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
994ae82c34 -s ours
am:
016843fa80 -s ours
Change-Id: I6532b8b1a57aa016227468720258c5ddec03850c
Bill Yi [Sun, 26 Aug 2018 19:58:09 +0000 (12:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
994ae82c34 -s ours
Change-Id: I779083c8a8685a719d462160cfd8c8b4479a406c
Doris Ling [Sun, 26 Aug 2018 06:34:33 +0000 (23:34 -0700)]
[automerger skipped] Merge "Fix crash in clicking Default Home gear icon." am:
0c724f5181 am:
51a72d4c38
am:
323e54ddf5 -s ours
Change-Id: Ia039b43a5e4301e0b7451181ef4be95e18bd847d
Doris Ling [Sun, 26 Aug 2018 06:24:51 +0000 (23:24 -0700)]
Merge "Fix crash in clicking Default Home gear icon." am:
0c724f5181
am:
51a72d4c38
Change-Id: I7ff6b0e405c3d87faa869bd53eee9983648ccf69
Doris Ling [Sun, 26 Aug 2018 06:12:24 +0000 (23:12 -0700)]
Merge "Fix crash in clicking Default Home gear icon."
am:
0c724f5181
Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
Bill Yi [Sat, 25 Aug 2018 23:44:47 +0000 (16:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e4f6e468679eec2ad1d8b821115e686e5a4c19a
TreeHugger Robot [Sat, 25 Aug 2018 01:09:17 +0000 (01:09 +0000)]
Merge "Create the main architecture for Settings Dynamic Homepage"
Treehugger Robot [Fri, 24 Aug 2018 23:58:31 +0000 (23:58 +0000)]
Merge "Fix crash in clicking Default Home gear icon."
TreeHugger Robot [Fri, 24 Aug 2018 23:50:11 +0000 (23:50 +0000)]
Merge "Fixed NPE that crashes Settings."
Emily Chuang [Wed, 25 Jul 2018 12:35:06 +0000 (20:35 +0800)]
Create the main architecture for Settings Dynamic Homepage
Create an architecture for the homepage to enable card adding
and displaying.
Bug:
111676964
Test: robotests
Change-Id: I06efe3d16585060a8e99313586ae29bbde7fe3e8
Doris Ling [Thu, 23 Aug 2018 20:25:06 +0000 (13:25 -0700)]
Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes:
112249115
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 24 Aug 2018 21:33:27 +0000 (21:33 +0000)]
Merge "Add Support for Virtual High Refresh Rate mode"
TreeHugger Robot [Fri, 24 Aug 2018 20:13:36 +0000 (20:13 +0000)]
Merge "Fix crash in clicking Default Home gear icon."
TreeHugger Robot [Fri, 24 Aug 2018 19:50:24 +0000 (19:50 +0000)]
Merge "Refresh conditions only when it changes."
Doris Ling [Thu, 23 Aug 2018 20:25:06 +0000 (13:25 -0700)]
Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes:
112249115
Test: make RunSettingsRoboTests
Fan Zhang [Fri, 24 Aug 2018 00:34:55 +0000 (17:34 -0700)]
Refresh conditions only when it changes.
- Instead of force refresh when user tap action button, we not wait
until state changes for each conditional cards.
Test: robotests
Change-Id: I2eca59a06b8cb332b7b99f017baefb3d5b53234b
TreeHugger Robot [Fri, 24 Aug 2018 16:02:14 +0000 (16:02 +0000)]
Merge "Remove red underline from Device name"
Mill Chen [Fri, 24 Aug 2018 05:02:54 +0000 (13:02 +0800)]
Remove red underline from Device name
- Turn off auto-correction for normal text.
Bug:
79421621
Test: make RunSettingsRoboTest
Change-Id: Ie7c4ebd33073ecaac2048d8630ec7b51e706341c
David Sodman [Fri, 20 Jul 2018 20:57:41 +0000 (13:57 -0700)]
Add Support for Virtual High Refresh Rate mode
Add a developer options settings switch to enable a virtual
HiFrequency panel mode to be able to test the SW stack with
display running at 50% faster than the default refresh
rate.
Bug:
111549030
Test: Enable HiFrequency mode and use systrace/adb to verity
Change-Id: Ibfd30ca1a14a146419233eaefa9b5095bf459adc
Lei Yu [Thu, 23 Aug 2018 19:39:29 +0000 (19:39 +0000)]
Merge "Hook up feature flag to mobile network controller"
TreeHugger Robot [Thu, 23 Aug 2018 19:09:48 +0000 (19:09 +0000)]
Merge "Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*"
Fan Zhang [Thu, 23 Aug 2018 18:20:07 +0000 (11:20 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am:
da38b41b9a -s ours am:
5c6f6949bf -s ours
am:
b984c81371 -s ours
Change-Id: I6d6584924602bf9f7d8f267cccfae8adce744f66
Fan Zhang [Thu, 23 Aug 2018 18:13:33 +0000 (11:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am:
da38b41b9a -s ours
am:
5c6f6949bf -s ours
Change-Id: I5857d75e1b068446ccfba8859c11e968bc7dade3
Fan Zhang [Thu, 23 Aug 2018 18:08:32 +0000 (11:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
am:
da38b41b9a -s ours
Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d
Treehugger Robot [Thu, 23 Aug 2018 17:38:38 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button."
Fan Zhang [Thu, 23 Aug 2018 16:25:18 +0000 (09:25 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes:
112986476
Bug:
111195268
Test: manual
TreeHugger Robot [Thu, 23 Aug 2018 15:56:18 +0000 (15:56 +0000)]
Merge "Check StorageWizardFormatConfirm runs smoothly"
TreeHugger Robot [Thu, 23 Aug 2018 15:52:00 +0000 (15:52 +0000)]
Merge "Check getLastCustomNonConfigurationInstance() works well"
Mill Chen [Thu, 23 Aug 2018 12:58:04 +0000 (20:58 +0800)]
Check StorageWizardFormatConfirm runs smoothly
- confirm that StorageWizardFormatConfirm works well after
changing calling method from showAllowingStateLoss() to show().
Bug:
111150236
Test: manual
Change-Id: I0ad6c54aaa2572fc5798ede900e0a6d10d2fbd35
SongFerngWang [Wed, 22 Aug 2018 07:55:07 +0000 (15:55 +0800)]
SIM status page sync signal strength and service state behavior from systemUI
To make behavior consistent in the long run and refactor the code
into settingslib and call it from both Settings and SystemUI.
Bug:
110973964
Test: run testcase and do manual test - test case as below:
1. Testcase: packages/apps/Settings: -> ALL PASS
make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest
2. Fake the service state's voice and data value,voice is out of service
and data is in-service,and then check service state and signal strength
at sim status page -> PASS
Change-Id: I4cc454b6b3d4242af4805e2878f9d46ce28649ad
Mill Chen [Thu, 23 Aug 2018 06:27:49 +0000 (14:27 +0800)]
Check getLastCustomNonConfigurationInstance() works well
- make sure that StorageWizardFormatProgress runs smoothly.
- confirm that mTask has the same object id when changing the screen
orientation.
Bug:
111151113
Test: manual
Change-Id: I730c1b0f08e8a20a1aafa668fb02cd5a09fdd70a
hughchen [Mon, 20 Aug 2018 09:22:32 +0000 (17:22 +0800)]
Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
1. Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
2. Use BluetoothDevice.setPhonebookAccessPermission() directly.
3. Use BluetoothDevice.setMessageAccessPermission() directly.
4. Use BluetoothDevice.getPhonebookAccessPermission() directly.
5. Use BluetoothDevice.getMessageAccessPermission() directly.
6. Use BluetoothDevice.getSimAccessPermission() directly.
Bug:
112517004
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibe6b207b891b9bd2b328a2e2c7264a9a78cb498f
TreeHugger Robot [Thu, 23 Aug 2018 02:13:20 +0000 (02:13 +0000)]
Merge "Fix special access summary text"
TreeHugger Robot [Thu, 23 Aug 2018 01:33:39 +0000 (01:33 +0000)]
Merge "Remove unnecessary check when setting permission summary"
jackqdyulei [Thu, 23 Aug 2018 00:45:23 +0000 (17:45 -0700)]
Hook up feature flag to mobile network controller
Send intent to phone process if the flag is false.
Bug:
113069948
Test: RunSettingsRoboTests
Change-Id: Ie9726470e718144557f318fe7ea28e863d63679c
Fan Zhang [Wed, 22 Aug 2018 18:06:07 +0000 (11:06 -0700)]
Fix special access summary text
Use ApplicationState to count number of apps using unrestricted_data.
Change-Id: I083ff50e3e516536c87afa71d786b22e83d9a498
Fixes:
69313992
Test: robotests
Fan Zhang [Thu, 23 Aug 2018 00:04:57 +0000 (17:04 -0700)]
Remove unnecessary check when setting permission summary
Activity null check is probably necessary when this logic is written in
fragment, now the logic is in a controller where all dependencies are
self contained, so we don't need to check activity null here.
Change-Id: Ifa32e0d6563c411f19bec07f176765a7c94c8a40
Fixes:
112289663
Test: robotests
jackqdyulei [Wed, 22 Aug 2018 21:44:29 +0000 (14:44 -0700)]
Fix the time flicker in battery settings page
Don't clear the text when reciever has been re-registered in
onResume(), where quickUpdate has been called.
Change-Id: Ie056dfb225a1bf6c224932b310a97499fc26e8f0
Fixes:
69312991
Test: RunSettingsRoboTests
TreeHugger Robot [Wed, 22 Aug 2018 19:22:33 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Felipe Leme [Wed, 22 Aug 2018 18:41:13 +0000 (11:41 -0700)]
Fixed NPE that crashes Settings.
It happens due to a race condition when the AutofillDeveloperSettingsObserver
is triggered by a settings change while the underlying preferences activity is
being finished.
Fixes:
113030661
Test: echo 'could not reproduce this issue'
Test: runtest --path \
packages/apps/Settings/tests/unit/src/com/android/settings/core/\
PreferenceControllerContractTest.java
Test: atest AutofillResetOptionsPreferenceControllerTest \
AutofillLoggingLevelPreferenceControllerTest
Change-Id: I761195df13ac10705b9ce6b0c7546ec66a85d3ef
Bill Yi [Wed, 22 Aug 2018 01:59:52 +0000 (18:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b36fe9f3af6121ff58f7c6b32713df7e66b3b8f
Auto-generated-cl: translation import
Adrian Roos [Wed, 22 Aug 2018 01:44:07 +0000 (18:44 -0700)]
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default am:
12c9be1255 -s ours
am:
c843167b3f -s ours
Change-Id: I503f6e405a90d2e2b83794310da8f45bc4aa91c3
Adrian Roos [Tue, 21 Aug 2018 23:43:39 +0000 (16:43 -0700)]
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
am:
12c9be1255 -s ours
Change-Id: Iaeffe4999365f975887b336598a7ab4bf078c7b9
Fan Zhang [Tue, 21 Aug 2018 23:13:56 +0000 (23:13 +0000)]
Merge "Remove getExtraAction() from DashboardFeatureProvider."
Adrian Roos [Tue, 21 Aug 2018 22:07:59 +0000 (15:07 -0700)]
[automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi-dev am:
8d82158036
am:
80c53bce68 -s ours
Change-Id: Ie247f02047b3d1f646dbdd762e94d9daac6ff18b
Adrian Roos [Tue, 21 Aug 2018 18:25:47 +0000 (20:25 +0200)]
DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Bug:
112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9
TreeHugger Robot [Tue, 21 Aug 2018 21:32:35 +0000 (21:32 +0000)]
Merge "Remove condition manager v1 code."
Adrian Roos [Tue, 21 Aug 2018 20:59:45 +0000 (13:59 -0700)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
am:
8d82158036
Change-Id: I6d6c191e1dc511d2ab6e563f7bbea27962fe7b63
TreeHugger Robot [Tue, 21 Aug 2018 20:49:37 +0000 (20:49 +0000)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
Fan Zhang [Tue, 21 Aug 2018 19:15:42 +0000 (12:15 -0700)]
Remove condition manager v1 code.
Change-Id: I866c1f7c493c6080ccf766ecfc8e6b00dafeecd9
Fixes:
112485407
Test: robotests
Adrian Roos [Tue, 21 Aug 2018 19:53:56 +0000 (19:53 +0000)]
Merge "Cutout emulation: string changes and ordering"
TreeHugger Robot [Tue, 21 Aug 2018 19:14:59 +0000 (19:14 +0000)]
Merge "Use title in ManagedServiceSetting dialogs"
TreeHugger Robot [Tue, 21 Aug 2018 19:01:31 +0000 (19:01 +0000)]
Merge changes from topics "remove_tile_summary_cache", "remove_tile_title"
* changes:
Use getSummary() to get tile summary text.
Use tile.getTitle(context) to get tile title.
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.
Bug:
112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.
Bug:
112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Merged-In: If2d05595d02a277896202ab2a6262c99508a3a17
Beverly [Tue, 21 Aug 2018 15:35:54 +0000 (11:35 -0400)]
Use title in ManagedServiceSetting dialogs
- Use the title (not summary) of the preference in its warning dialogs
Test: manual
Bug:
112687996
Change-Id: Ia217e5252cf7a48450da853c0270093ffb57dca7
Fan Zhang [Tue, 21 Aug 2018 16:19:12 +0000 (16:19 +0000)]
Merge "Use searchable="false" to suppress nonIndexables."
Julia Reynolds [Tue, 21 Aug 2018 14:39:07 +0000 (10:39 -0400)]
Fix notifications crash
Change-Id: I75a34beb124de92c0d7d9033e3fe21dbdeb67ed3
Fixes:
112656503
Test: manual
TreeHugger Robot [Tue, 21 Aug 2018 00:49:31 +0000 (00:49 +0000)]
Merge "Add RecyclerView for contextual settings homepage."