OSDN Git Service
Dario Freni [Tue, 24 Jul 2018 11:11:18 +0000 (04:11 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours am:
1e56e69a46 -s ours am:
1237373743 -s ours
am:
64e4c89ef6 -s ours
Change-Id: I8b4a41fa2ef2fb023ba4f5ac96494be8172cb6ec
Dario Freni [Tue, 24 Jul 2018 11:06:25 +0000 (04:06 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours am:
1e56e69a46 -s ours
am:
1237373743 -s ours
Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e
Dario Freni [Tue, 24 Jul 2018 11:02:45 +0000 (04:02 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours
am:
1e56e69a46 -s ours
Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
Dario Freni [Tue, 24 Jul 2018 10:58:08 +0000 (03:58 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition."
am:
aa2ec5f239 -s ours
Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
Treehugger Robot [Tue, 24 Jul 2018 10:35:44 +0000 (10:35 +0000)]
Merge "Include NOTICE file in /product partition."
TreeHugger Robot [Tue, 24 Jul 2018 10:17:53 +0000 (10:17 +0000)]
Merge "Delegate PrintServicesLoader to the framework's one"
Fan Zhang [Mon, 23 Jul 2018 20:51:40 +0000 (13:51 -0700)]
Move CategoryManager to Settings.
Bug:
77600770
Test: robo
Change-Id: Id4a0c89938d43d21147944b820a191486c589238
Irina Dumitrescu [Mon, 23 Jul 2018 12:54:14 +0000 (13:54 +0100)]
Update notification_settings_work_profile comment.
Test: n/a
Fixes:
111699435
Change-Id: I1a33204f5305db28e7d423b4b2523ed64c675e46
Kevin Chyn [Sat, 21 Jul 2018 01:24:58 +0000 (01:24 +0000)]
Merge "Fix settings crash after androidx refactoring"
Kevin Chyn [Sat, 21 Jul 2018 00:19:39 +0000 (17:19 -0700)]
Fix settings crash after androidx refactoring
Fixes:
111701576
Change-Id: I095d4837e7a34fb9f240f2a302b5c6f7d1142db9
Fixes:
111701576
Ian Pedowitz [Fri, 20 Jul 2018 23:37:07 +0000 (16:37 -0700)]
Remove the character limit
This could cause existing messages to get clipped
Effectively reverting part of
e7c3ca0e2ebde28b98847d1a21a6aa64fb4a973e
Bug:
111577594
Test: None, is a revert of this config
Change-Id: Ifaa8c9674db3c6865b3b59fcd254bb3e2b20a5f5
TreeHugger Robot [Fri, 20 Jul 2018 23:32:35 +0000 (23:32 +0000)]
Merge "Request lock screen message focus and limit character limit"
TreeHugger Robot [Fri, 20 Jul 2018 23:10:28 +0000 (23:10 +0000)]
Merge "Hide lock screen display in search if it's not in Settings"
Fan Zhang [Fri, 20 Jul 2018 22:34:13 +0000 (15:34 -0700)]
Request lock screen message focus and limit character limit
Change-Id: I78594d03ae5430f63e46cb97e2413c1c4bf60d8a
Fixes:
111577594
Test: manual
Doris Ling [Fri, 20 Jul 2018 22:28:53 +0000 (22:28 +0000)]
Merge "Fix battery animation not being played."
Fan Zhang [Fri, 20 Jul 2018 21:52:06 +0000 (21:52 +0000)]
Merge changes from topic "migrate-alerdialog-androidx"
* changes:
Migrate all AlertDialogs to AndroidX version
Migrate all AlertDialogs to AndroidX version
Fan Zhang [Fri, 20 Jul 2018 21:40:54 +0000 (14:40 -0700)]
Hide lock screen display in search if it's not in Settings
Change-Id: Iacf16eb947a679e08a6c55e0764416cd53cac2e7
Fixes:
111641373
Test: robotests
TreeHugger Robot [Fri, 20 Jul 2018 21:32:07 +0000 (21:32 +0000)]
Merge "Remove ref to tile.remoteView, which is no longer used"
Doris Ling [Thu, 19 Jul 2018 20:53:27 +0000 (13:53 -0700)]
Fix battery animation not being played.
- VideoPreference now checks the view visible flag to see if it
should start playing the video when the surface texture is being
updated. Added a default controller for the VideoPreference to
update the view visible flag of the VideoPrefernece when the
setting page is paused/resumed accordingly.
- add the default controller to the adaptive battery video and the
adaptive brightness video.
Change-Id: I1aae2148c27c7157c97541346790542c74377e5a
Fixes:
111103815
Test: make RunSettingsRoboTests
Fan Zhang [Fri, 20 Jul 2018 19:56:39 +0000 (12:56 -0700)]
Remove ref to tile.remoteView, which is no longer used
Bug:
77600770
Test: rebuild
Change-Id: If0fdd67dd3098d063584acaf2b262a04c209a569
Chalard Jean [Fri, 20 Jul 2018 19:42:07 +0000 (12:42 -0700)]
Merge "Use the SSID of the network in the no internet dialog" am:
692f989b98 am:
9971303508 am:
28a2b521cf
am:
92295f0953
Change-Id: I1ef9422507de2aa9ee29ec3c52b17f3bf7363a06
Chalard Jean [Fri, 20 Jul 2018 19:33:56 +0000 (12:33 -0700)]
Merge "Use the SSID of the network in the no internet dialog" am:
692f989b98 am:
9971303508
am:
28a2b521cf
Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab
Chalard Jean [Fri, 20 Jul 2018 19:29:46 +0000 (12:29 -0700)]
Merge "Use the SSID of the network in the no internet dialog" am:
692f989b98
am:
9971303508
Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6
Chalard Jean [Fri, 20 Jul 2018 19:25:39 +0000 (12:25 -0700)]
Merge "Use the SSID of the network in the no internet dialog"
am:
692f989b98
Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
Treehugger Robot [Fri, 20 Jul 2018 18:57:09 +0000 (18:57 +0000)]
Merge "Use the SSID of the network in the no internet dialog"
Bill Yi [Fri, 20 Jul 2018 18:41:40 +0000 (11:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
0a8de9d763 -s ours
am:
9551717c69 -s ours
Change-Id: Ib0facfffd92a2a3ea1115b6da5eb65a8ad1d44e2
Bill Yi [Fri, 20 Jul 2018 18:33:55 +0000 (11:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0a8de9d763 -s ours
Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174
TreeHugger Robot [Fri, 20 Jul 2018 17:02:15 +0000 (17:02 +0000)]
Merge "Fix color of status bar"
Xin Li [Fri, 20 Jul 2018 08:36:53 +0000 (01:36 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am:
e8858cc954
am:
9652d9ec5b
Change-Id: I251279ea01e26d62a66535a2b675b7e9418db6a5
Mill Chen [Fri, 20 Jul 2018 07:13:45 +0000 (15:13 +0800)]
Fix color of status bar
- Set true value to windowLightStatusBar
Bug:
111665984
Test: rebuild
Change-Id: I9808256be052e383656976555cfca5baf60634c6
Xin Li [Fri, 20 Jul 2018 06:45:48 +0000 (23:45 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am:
e8858cc954
Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef
Jason Chiu [Wed, 18 Jul 2018 08:39:29 +0000 (16:39 +0800)]
Delegate PrintServicesLoader to the framework's one
1. Remove the duplicated PrintServicesLoader in Settings
2. Make a androidx.loader in Settings and internally just delegate all calls to the real PrintServicesLoader
3. Get the result from the real loader
Test: manual
Fixes:
111581651
Change-Id: I2a9b3653f5c68f8383a468cd16ef5f7c3fd4bc3a
tmfang [Tue, 17 Jul 2018 05:53:04 +0000 (13:53 +0800)]
Migrate all AlertDialogs to AndroidX version
- Let test cases can be compatible with AndroidX AlertDialog.
- Theme of Transparent needs to support AndroidX AlertDialog.
Change-Id: I0789b66f52feef30ebab7fb824d0e39d5ae9cc96
Fixes:
111413092
Test: make RunSettingsRoboTests -j56
tmfang [Tue, 17 Jul 2018 05:53:04 +0000 (13:53 +0800)]
Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.
Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes:
111413092
Test: This CL can't pass Robo test.
Bill Yi [Fri, 20 Jul 2018 02:35:10 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
TreeHugger Robot [Thu, 19 Jul 2018 23:07:09 +0000 (23:07 +0000)]
Merge "Move logic from SavedAccessPoint fragment to controller"
Fan Zhang [Thu, 19 Jul 2018 00:01:53 +0000 (17:01 -0700)]
Move logic from SavedAccessPoint fragment to controller
Change-Id: Ic54e536f97490cec1746fa58c42ec55b60d17f0e
Fixes:
64806699
Test: robotests
TreeHugger Robot [Thu, 19 Jul 2018 21:16:34 +0000 (21:16 +0000)]
Merge "Fix cached app icon being used in app list."
Xin Li [Thu, 19 Jul 2018 20:50:34 +0000 (13:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug:
111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
Doris Ling [Fri, 13 Jul 2018 20:34:11 +0000 (13:34 -0700)]
Fix cached app icon being used in app list.
- change to use the icon from IconDrawableFactory instead of from app
info when building the application list.
Fixes:
63978676
Test: manual, reinstall an app with updated icon and launch
settings->Apps & notifications->See all apps and check the app icon.
Change-Id: I99028ef97fb4fec8c90708b26caaddb7325c1ddb
TreeHugger Robot [Thu, 19 Jul 2018 19:25:49 +0000 (19:25 +0000)]
Merge "Use SettingsRobolectricTestRunner in settings app"
TreeHugger Robot [Thu, 19 Jul 2018 18:50:36 +0000 (18:50 +0000)]
Merge "Make app predicates singleton"
jackqdyulei [Thu, 19 Jul 2018 18:21:20 +0000 (11:21 -0700)]
Use SettingsRobolectricTestRunner in settings app
Change-Id: I3682ea52c53ff4fcce7e9aa52a4a6827bb31b2cb
Fixes:
111646366
Test: robotest
jackqdyulei [Wed, 18 Jul 2018 20:06:11 +0000 (13:06 -0700)]
Make app predicates singleton
1. AppLabelPredicate
2. AppRestrictionPredicate
Change-Id: I1fd8611c5dd7ffa6318bcb23de7a973c111910b6
Fixes:
111323520
Test: RunSettingsRoboTests
TreeHugger Robot [Thu, 19 Jul 2018 17:44:48 +0000 (17:44 +0000)]
Merge "Fix a test broken by fragment migration."
Lei Yu [Thu, 19 Jul 2018 17:14:45 +0000 (17:14 +0000)]
Merge "Hook up anomaly active hour to BatteryTipPolicy"
TreeHugger Robot [Thu, 19 Jul 2018 16:58:17 +0000 (16:58 +0000)]
Merge "Move functions to settingslib for more code reuse"
TreeHugger Robot [Thu, 19 Jul 2018 16:32:56 +0000 (16:32 +0000)]
Merge "Fixed data usage displaying problem"
Aarthi Balachander [Thu, 12 Jul 2018 21:36:57 +0000 (14:36 -0700)]
Move functions to settingslib for more code reuse
Bug:
110376110
Test: Tested on device
Change-Id: I2bbb8d01f675fc254e783b97b44d16f36846a416
SunnyShao [Tue, 17 Jul 2018 10:42:30 +0000 (18:42 +0800)]
Fixed data usage displaying problem
- Changed "Data usage" to "Mobile data & Wi-Fi" in App info page
- Chageed the title "App data usage" to "Mobile data & Wi-Fi"
Change-Id: I7699465ca5c7b1786c6f9e33bc25a2dd70181ce6
Fixes:
34515307
Test: visual
TreeHugger Robot [Thu, 19 Jul 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Use the migrated injected setting code in settingslib. Manual merge to master from pi-car-dev Bug:
68198078 Test: Tested on device Change-Id: Iff767cd6bf7408b45ce9594628d3fd0a71744e9f"
Raff Tsai [Thu, 19 Jul 2018 01:00:28 +0000 (01:00 +0000)]
Merge "Fix AlertDialog corner and color accent"
TreeHugger Robot [Thu, 19 Jul 2018 00:25:14 +0000 (00:25 +0000)]
Merge "Convert SavedAccessPoints to DashboardFragment (step 1)"
TreeHugger Robot [Wed, 18 Jul 2018 23:32:10 +0000 (23:32 +0000)]
Merge "Clean up saved network screen"
Fan Zhang [Wed, 18 Jul 2018 22:46:49 +0000 (15:46 -0700)]
Convert SavedAccessPoints to DashboardFragment (step 1)
Change-Id: I5d8fa8497e04c9314dead9af7534df4507ffd591
Bug:
64806699
Test: robotest
Fan Zhang [Wed, 18 Jul 2018 21:31:44 +0000 (14:31 -0700)]
Clean up saved network screen
Bug:
64806699
Test: rebuild
Change-Id: I4392809f08034c7c13575db2f5c41468fcea0987
TreeHugger Robot [Wed, 18 Jul 2018 20:43:38 +0000 (20:43 +0000)]
Merge "Unrestrict SMS/PHONE app if it been set active"
Aarthi Balachander [Wed, 11 Jul 2018 00:04:53 +0000 (17:04 -0700)]
Use the migrated injected setting code in settingslib.
Manual merge to master from pi-car-dev
Bug:
68198078
Test: Tested on device
Change-Id: Iff767cd6bf7408b45ce9594628d3fd0a71744e9f
jackqdyulei [Fri, 13 Jul 2018 21:50:04 +0000 (14:50 -0700)]
Unrestrict SMS/PHONE app if it been set active
If an app been set default SMS/PHONE app, we need to unrestrict this
app. This CL extract a common function and invoke it when necessary.
Change-Id: Id29c5138438aa6f6f22cdd9c4ecf336de8481782
Fixes:
80305978
Test: robotests
TreeHugger Robot [Wed, 18 Jul 2018 16:30:31 +0000 (16:30 +0000)]
Merge "Fix test cases broken"
TreeHugger Robot [Wed, 18 Jul 2018 14:45:20 +0000 (14:45 +0000)]
Merge "Disable notification settings access from work apps."
Irina Dumitrescu [Mon, 9 Jul 2018 20:12:17 +0000 (21:12 +0100)]
Disable notification settings access from work apps.
Fixes:
79241388
Test: the following command does not open the notification settings in
work profile user:
$ adb shell am start --user $USER -W -a android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS
Moreover, triggering the notifications from a sample app results in the
new toast being displayed.
Change-Id: I0a330a9cf22c813aea7600557660868263817e1e
tmfang [Tue, 17 Jul 2018 01:54:14 +0000 (09:54 +0800)]
Fix test cases broken
- AndroiX AlertDialog needs to use Theme.AppCompat.
- Create a ShadowAlertDialogCompat which can be compatible with AndroidX AlertDialog.
Fix:
111247403
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.password.ChooseLockTypeDialogFragmentTest
Change-Id: I3e4bca285ecaefa5705c8d170050c21d1bc649e0
Raff Tsai [Tue, 17 Jul 2018 01:59:58 +0000 (09:59 +0800)]
Fix AlertDialog corner and color accent
- Add some attributes in Theme.AlertDialog
Change-Id: Ifb9ca98ee11f6c82cda4a576d10b5fde54f788be
Fixes:
110917586
Test: mannual
TreeHugger Robot [Wed, 18 Jul 2018 07:38:38 +0000 (07:38 +0000)]
Merge "Remove LocalePickerWithRegion class in Settings."
Jackal Guo [Wed, 18 Jul 2018 05:37:08 +0000 (05:37 +0000)]
Merge "Change the order of preferences in a11y"
Jason Chiu [Wed, 18 Jul 2018 02:49:13 +0000 (10:49 +0800)]
Fix a test broken by fragment migration.
Change-Id: I68e4f9b53d3492817ea9416fd4127fbe15337ce6
Fixes:
111193572
Test: robotests
TreeHugger Robot [Wed, 18 Jul 2018 00:59:41 +0000 (00:59 +0000)]
Merge "Remove unused battery strings"
TreeHugger Robot [Wed, 18 Jul 2018 00:25:26 +0000 (00:25 +0000)]
Merge "Remove ListView from preference_list_fragment."
jackqdyulei [Tue, 17 Jul 2018 23:27:46 +0000 (16:27 -0700)]
Remove unused battery strings
Change-Id: Ic463c353837078e6d5b960b458e210174b50fa37
Fixes:
36738738
Test: Build
Fan Zhang [Tue, 17 Jul 2018 16:11:59 +0000 (09:11 -0700)]
Remove ListView from preference_list_fragment.
As part of it, Use RecyclerView in PrintServiceSettingsFragment, which
still depends on the old preference_list_frag layout.
Also remove some unused pngs
Test: manual
Change-Id: I3189bd0dee5b6a74209eb1e707eb40427c96e312
Salvador Martinez [Tue, 17 Jul 2018 22:45:29 +0000 (15:45 -0700)]
Fix dialogs in Theme.Settings
Theme.Settings was explicitly using a Light theme. This CL
changes it to DayNight so that it properly changes colors in
night mode.
Test: visual inspection, screenshot
Bug:
111397440
Change-Id: I20088a9021ddfe7d6e92c3b52ce4ca65ada07983
jackqdyulei [Tue, 17 Jul 2018 22:05:26 +0000 (15:05 -0700)]
Hook up anomaly active hour to BatteryTipPolicy
So we can control it from server side.
Bug:
80192137
Test: RunSettingsRoboTests
Change-Id: Ic9a4db44029bdcd7e45f4f9fb6b7d71c8c07c429
TreeHugger Robot [Tue, 17 Jul 2018 22:00:15 +0000 (22:00 +0000)]
Merge "Fix the title mismatch bug of Languages sub-settings page."
TreeHugger Robot [Tue, 17 Jul 2018 21:09:36 +0000 (21:09 +0000)]
Merge changes from topic "rm_odr_anomaly"
* changes:
Move anomaly code to BatteryTipUtils
Remove the anomaly detection added in O-DR
jackqdyulei [Fri, 13 Jul 2018 00:06:42 +0000 (17:06 -0700)]
Move anomaly code to BatteryTipUtils
Then we could reuse it across settings.
Bug:
74529048
Test: robo test that cover each components still pass
Change-Id: Ied0bbc6e6a1dca9628c2c084c3284ffab2f85160
jackqdyulei [Thu, 12 Jul 2018 22:16:30 +0000 (15:16 -0700)]
Remove the anomaly detection added in O-DR
1. Remove unused class and resources
2. Update function in AdvancedPowerUsageDetail since
we don't need pass in anomaly anymore
Change-Id: I96fbe5ddaae902b34b756c7aae0338e49afef1f3
Bug:
74529048
Test: 1. manual test in settings page. 2. robo test still pass
TreeHugger Robot [Tue, 17 Jul 2018 19:30:39 +0000 (19:30 +0000)]
Merge "Allow activity to delegate onActivityResult to fragments"
Yanting Yang [Tue, 17 Jul 2018 10:09:57 +0000 (18:09 +0800)]
Fix the title mismatch bug of Languages sub-settings page.
- modify the title of Language sub-settings page.
- remove the unused string id, pref_title_lang_selection.
Change-Id: I445493f6769c9888a27b72471fc9282df3655406
Fixes:
111322494
Test: manual
Fan Zhang [Tue, 17 Jul 2018 17:12:30 +0000 (10:12 -0700)]
Allow activity to delegate onActivityResult to fragments
Change-Id: Iac388f1726269239313d666f3123f28348e0c90a
Fixes:
111531567
Test: rototests
jackqdyulei [Fri, 13 Jul 2018 20:23:33 +0000 (13:23 -0700)]
Add scrollview for dns dialog
Also update dialog to appcompat to avoid the crash
Change-Id: Ide6483f1160713dae8111de533a8b3345a3420c2
Fixes:
111351793
Test: Manual
tmfang [Fri, 13 Jul 2018 03:11:26 +0000 (11:11 +0800)]
Remove LocalePickerWithRegion class in Settings.
This class is too complex, we can't afford maintaining this long term.
We need a new Activity that wraps the framework version of LocalePickerWithRegion.
Bug:
111373939
Test: manual test & make RunSettingsRoboTests -j56
Change-Id: I93c719246b84350d2eee4e8ce1ffd97cd168925b
Jason Chiu [Tue, 17 Jul 2018 03:53:49 +0000 (11:53 +0800)]
Fix a test broken by fragment migration.
Test: make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
111194177
Change-Id: Ifd2d980bbf397ad9875b43d654ab4fc52c4627c2
Jackal Guo [Tue, 17 Jul 2018 02:15:19 +0000 (10:15 +0800)]
Change the order of preferences in a11y
Some preference items have the same order, and it makes these items
be sorted in different position per languages. Use unique order for
each items instead.
Bug:
77949267
Test: atest CtsAccessibilityTestCases
Test: manual check the order in different languages
Change-Id: Ibfcb316c4299266b053053d9d88819a7dcc158fa
TreeHugger Robot [Tue, 17 Jul 2018 02:33:50 +0000 (02:33 +0000)]
Merge "Move non-theme styles to styles.xml"
Fan Zhang [Mon, 16 Jul 2018 23:28:37 +0000 (16:28 -0700)]
Move non-theme styles to styles.xml
1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources
Bug:
111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a
TreeHugger Robot [Tue, 17 Jul 2018 00:23:46 +0000 (00:23 +0000)]
Merge "Remove more unused theme customization"
TreeHugger Robot [Tue, 17 Jul 2018 00:21:23 +0000 (00:21 +0000)]
Merge "Add a back-up icon resource to icon-less Slices"
Fan Zhang [Mon, 16 Jul 2018 21:29:39 +0000 (14:29 -0700)]
Remove more unused theme customization
Bug:
111454230
Test: manual
Change-Id: I704247ffe1092165365f7604f17372c79afd46ed
Matthew Fritze [Fri, 13 Jul 2018 21:05:38 +0000 (14:05 -0700)]
Add a back-up icon resource to icon-less Slices
Currently, when a Settings Slice dosen't have an icon, we add an IconCompat
object with the resource 0x0 - which gives an empty icon. This is from the UX
direction that we should only have icons for Settings Slices when the
corresponding Settings have icons in the Settings UI.
However, this causes an issue with a recent change to SliceView, which crashes
the UI when a Slice is rendered without an icon. Previously, the icon code path
was only exercised when the Slice Shortcut view was being used, but after the
change, the icon path is always used and thus crashes when trying to fetch a
resource with id 0x0 from Settings or another provider.
About 2/3rds of Settings Slices do not have icons.
This change adds the Settings App icon as the back-up icon for any Slice which
would otherwise not have an icon.
The impact of missing this change is:
- Settings Slices cannot be shown in launcher spaces until a post-P update comes
from the support library.
- If Settings launches with the bug, Slices cannot patch the API which would require
all Slices to have a non empty icon (b/
111438616)
Bug:
111082093
Test: Robotests, Settings Search UI testing, Slice browser testing
Change-Id: I6f326b6b41bf59011a211c6340dd639f68e754e1
TreeHugger Robot [Mon, 16 Jul 2018 22:12:05 +0000 (22:12 +0000)]
Merge "Clean up theme part 1: move attrs to attrs.xml"
Brad Ebinger [Mon, 16 Jul 2018 21:21:57 +0000 (14:21 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API." am:
9e4ff6fca6 am:
15ca33865c
am:
aca1e304bd
Change-Id: I0b3b6198e895caf4c33354ffb2fc20b599540387
TreeHugger Robot [Mon, 16 Jul 2018 21:08:21 +0000 (21:08 +0000)]
Merge "Fix a incorrect type cast for alert dialog"
Fan Zhang [Mon, 16 Jul 2018 19:33:36 +0000 (12:33 -0700)]
Clean up theme part 1: move attrs to attrs.xml
And remove unused theme and layouts.
Bug:
111454230
Test: rebuild
Change-Id: Iaf418a9a3dc014fc0eac096e60b0e4581c6ededb
Brad Ebinger [Mon, 16 Jul 2018 20:55:25 +0000 (13:55 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API." am:
9e4ff6fca6
am:
15ca33865c
Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
Brad Ebinger [Mon, 16 Jul 2018 20:32:55 +0000 (13:32 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API."
am:
9e4ff6fca6
Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
Brad Ebinger [Mon, 16 Jul 2018 19:57:31 +0000 (19:57 +0000)]
Merge "IMS: Use the slot based ImsManager factory reset API."
Fan Zhang [Mon, 16 Jul 2018 19:18:32 +0000 (12:18 -0700)]
Fix a incorrect type cast for alert dialog
Change-Id: I2265c4510785f88ef7950cd29779848eb2e58dc4
Fixes:
111488148
Test: manual
Doris Ling [Mon, 16 Jul 2018 18:51:46 +0000 (11:51 -0700)]
[automerger skipped] DO NOT MERGE Fix summary text for advanced button. am:
20e7c9d0ba -s ours
am:
ca9617ac6b -s ours
Change-Id: I163ccd679b9321013ec064172442146e732d8e3e
Doris Ling [Mon, 16 Jul 2018 18:46:54 +0000 (11:46 -0700)]
[automerger skipped] DO NOT MERGE Fix summary text for advanced button.
am:
20e7c9d0ba -s ours
Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6