OSDN Git Service
Maurice Lam [Fri, 15 Feb 2019 18:55:34 +0000 (18:55 +0000)]
Merge "Revert "Revert "Remove TemplateLayout that is not for external use"""
Lei Yu [Fri, 15 Feb 2019 18:26:56 +0000 (18:26 +0000)]
Merge "Update battery summary"
TreeHugger Robot [Fri, 15 Feb 2019 15:42:35 +0000 (15:42 +0000)]
Merge "Update the summary for DND conditional"
Mill Chen [Wed, 13 Feb 2019 10:48:48 +0000 (18:48 +0800)]
Update the summary for DND conditional
Since original string is too long for DND conditional subtext, separate
DND conditional to two different states, one is for "Phone muted" state,
the othe is for "With exceptions" state.
Also, clean up the strings of other product variants for the conditional.
Bug:
122929205
Test: visual
Change-Id: Icb156ff9a4858a26355d92e6d4fb82ad1927b278
Xin Li [Fri, 15 Feb 2019 05:49:04 +0000 (21:49 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master am:
f6aad2aee8 -s ours
am:
82b262afbd -s ours
am skip reason: subject contains skip directive
Change-Id: Ic32a4ab23aa2bdf991881e12bcf99d73be042baa
Android Build Merger (Role) [Fri, 15 Feb 2019 05:28:05 +0000 (05:28 +0000)]
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am:
d61c2adf09 -s ours am:
44ace71846 -s ours am skip reason: subject contains skip directive"
TreeHugger Robot [Fri, 15 Feb 2019 05:14:46 +0000 (05:14 +0000)]
Merge "Use BiometricPrompt description field for CC description instead"
Xin Li [Fri, 15 Feb 2019 05:08:49 +0000 (21:08 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am:
d61c2adf09 -s ours
am:
44ace71846 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b9d869dd64767b498d75f3fe1c9a6746f943b56
TreeHugger Robot [Fri, 15 Feb 2019 03:41:25 +0000 (03:41 +0000)]
Merge "Add null check for CarrierConfig"
jackqdyulei [Fri, 15 Feb 2019 03:11:10 +0000 (19:11 -0800)]
Update battery summary
When it is charging, show "5% - charging"(not only "5%")
Bug:
112013485
Test: RunSettingsRoboTests
Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc
Kevin Chyn [Fri, 15 Feb 2019 01:43:45 +0000 (17:43 -0800)]
Use BiometricPrompt description field for CC description instead
The description field handles longer strings more gracefully
Fixes:
124001277
Test: 1) Open Wi-Fi picker
2) Select gear on the connected network
3) Select share button
4) On BiometricPrompt, text is not cropped
Change-Id: I945830a137a0dc203bba04728b507ceff020dfdc
Xin Li [Fri, 15 Feb 2019 01:18:04 +0000 (17:18 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
am:
f6aad2aee8 -s ours
am skip reason: subject contains skip directive
Change-Id: I4bf7e0d090e49c1273ca1ad81bffe26825e34e47
Fan Zhang [Fri, 15 Feb 2019 00:51:12 +0000 (00:51 +0000)]
Merge "Do not allow draw on top for default sms picker."
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Lei Yu [Fri, 15 Feb 2019 00:06:59 +0000 (00:06 +0000)]
Merge "Adjust layout padding for SlicePreference"
Fan Zhang [Thu, 14 Feb 2019 23:13:44 +0000 (23:13 +0000)]
Merge "Mass clean up: don't cast class when not needed."
Xin Li [Thu, 14 Feb 2019 22:41:06 +0000 (14:41 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am:
d61c2adf09 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia83108724808a1bb96ed25b0607545bda5abb7b9
jackqdyulei [Mon, 11 Feb 2019 20:26:18 +0000 (12:26 -0800)]
Adjust layout padding for SlicePreference
To make sure text align to other preferences. This CL also
update related style name.
Bug:
124234686
Test: Manual
Change-Id: I9df8ba15630fce5509a8c8a1cbc17f103fcc6481
Xin Li [Thu, 14 Feb 2019 22:11:39 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
Maurice Lam [Thu, 14 Feb 2019 22:04:30 +0000 (22:04 +0000)]
Revert "Revert "Remove TemplateLayout that is not for external use""
This reverts commit
0111db7181471cbf0e2f724026dba11f92dbe5cd.
Reason for revert: Roll forward
Change-Id: I0a7642915dbf3b16115456ab9c264cf1acf93d01
Maurice Lam [Thu, 14 Feb 2019 22:03:58 +0000 (22:03 +0000)]
Merge "Revert "Remove TemplateLayout that is not for external use""
Maurice Lam [Thu, 14 Feb 2019 22:01:10 +0000 (22:01 +0000)]
Revert "Remove TemplateLayout that is not for external use"
This reverts commit
39b02386f7ca93792d4261103b5b90c777d7dc8e.
Reason for revert: b/
124450605
Change-Id: I3b2d66c87dc645da0d4e8ded798a1b80381523cf
Brad Ebinger [Thu, 14 Feb 2019 21:23:41 +0000 (13:23 -0800)]
[automerger skipped] Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8 am:
ee4a5291a1
am:
9f2b104953 -s ours
am skip reason: change_id I2af91c3734274f0aea942a8bb894d6f4ce295354 with SHA1
69dbf4bf84 is in history
Change-Id: Ie9a3d60d7ca4deb8e4e43e45a03e52191344962d
Brad Ebinger [Thu, 14 Feb 2019 21:19:37 +0000 (13:19 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8
am:
ee4a5291a1
Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
Brad Ebinger [Thu, 14 Feb 2019 21:15:44 +0000 (13:15 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am:
db7da4cba8
Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
TreeHugger Robot [Thu, 14 Feb 2019 21:04:32 +0000 (21:04 +0000)]
Merge "Add accessibility usage preference to the Privacy screen."
Brad Ebinger [Thu, 14 Feb 2019 21:01:05 +0000 (21:01 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
TreeHugger Robot [Thu, 14 Feb 2019 20:43:23 +0000 (20:43 +0000)]
Merge "Apply new slice attributes to customize layout"
jackqdyulei [Thu, 14 Feb 2019 19:30:02 +0000 (11:30 -0800)]
Add null check for CarrierConfig
CarrierConfig maybe null when config loader is not ready, so we need
to add null check here.
Bug:
124447166
Test: RunSettingsRoboTests
Change-Id: I3c104f1ca44bb0bcacad460c68084163c758746a
Fan Zhang [Thu, 14 Feb 2019 20:25:29 +0000 (12:25 -0800)]
Mass clean up: don't cast class when not needed.
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
Brad Ebinger [Thu, 14 Feb 2019 18:54:55 +0000 (18:54 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
TreeHugger Robot [Thu, 14 Feb 2019 18:24:40 +0000 (18:24 +0000)]
Merge "Updated screen lock type picker footer strings"
TreeHugger Robot [Thu, 14 Feb 2019 18:03:19 +0000 (18:03 +0000)]
Merge "Fix only one "active" HA showing under Accessibility Settings"
Bernard Chau [Mon, 11 Feb 2019 16:26:56 +0000 (16:26 +0000)]
Updated screen lock type picker footer strings
Bug:
111173457
Test: N/A
Change-Id: I5a4fe3d6e35cd8ae068f2235faa302c8a5c03c97
Jason Chiu [Thu, 14 Feb 2019 09:00:35 +0000 (17:00 +0800)]
Apply new slice attributes to customize layout
Fixes:
114807643
Test: robotest
Change-Id: I6c3975f08268cb831627f63c241428ae4574af1f
Xin Li [Tue, 12 Feb 2019 22:54:28 +0000 (14:54 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug:
124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
markchien [Thu, 14 Feb 2019 06:43:11 +0000 (22:43 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627 am:
2ee5beaa32
am:
c77ee11e4e
Change-Id: Ib14b4a7b3a5b8eb23c7229318ecd785605e1a4f0
markchien [Thu, 14 Feb 2019 06:39:00 +0000 (22:39 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627
am:
2ee5beaa32
Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am:
f1e3e9d627
Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix wrong TetherProvisioningActivity definition"
TreeHugger Robot [Thu, 14 Feb 2019 04:58:05 +0000 (04:58 +0000)]
Merge "Check for null before invoking finish()"
Pasty Chang [Thu, 14 Feb 2019 04:03:43 +0000 (04:03 +0000)]
Merge "Remove TemplateLayout that is not for external use"
markchien [Thu, 14 Feb 2019 03:11:31 +0000 (11:11 +0800)]
Fix wrong TetherProvisioningActivity definition
Bug:
122108346
Bug:
120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
Malcolm Chen [Wed, 13 Feb 2019 01:02:34 +0000 (17:02 -0800)]
Don't show hidden subscriptions.
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.
Bug:
121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
Kevin Chyn [Thu, 14 Feb 2019 02:23:08 +0000 (18:23 -0800)]
Check for null before invoking finish()
Fixes:
124406109
Test: manual
Change-Id: Idee87c060ffd84395355ccdc5248166f1a6aeaf0
TreeHugger Robot [Thu, 14 Feb 2019 01:36:30 +0000 (01:36 +0000)]
Merge "Add logging for SettingsPanels"
timhypeng [Wed, 13 Feb 2019 06:42:39 +0000 (14:42 +0800)]
Fix only one "active" HA showing under Accessibility Settings
-return main device on getConnectedHearingAidDevice()
-add test case
Bug:
123777253
Test: make -j42 RunSettingsRoboTests
Change-Id: I63522311b2248df983f200864b5465c0055056da
TreeHugger Robot [Thu, 14 Feb 2019 01:25:39 +0000 (01:25 +0000)]
Merge "Robotest fix."
Hall Liu [Thu, 14 Feb 2019 01:17:51 +0000 (17:17 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3 am:
5232a30b03
am:
89b61e8e0a
Change-Id: Id7ff8fadb12185700859ceea48e3ddc6db4688bd
Hall Liu [Thu, 14 Feb 2019 00:33:22 +0000 (16:33 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3
am:
5232a30b03
Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
Hall Liu [Thu, 14 Feb 2019 00:14:10 +0000 (16:14 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
am:
a23ceba5c3
Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
Matthew Fritze [Fri, 8 Feb 2019 22:09:35 +0000 (14:09 -0800)]
Add logging for SettingsPanels
The 3 main categories are:
- Panel Opened
- Panel Closed
- Panel Slice interaction
There are 3 close events:
- See more button
- Done button
- Clicking outside the panel
Slice interactions will log the Uri of the Slice and the ActionType,
such as Toggle, Slider, Content (intent).
Change-Id: Iecad948f39f50dd12ae1bcb23a5d523e0df8bb98
Fixes:
117804231
Test: robotests
Alex Buynytskyy [Wed, 13 Feb 2019 23:55:38 +0000 (15:55 -0800)]
Robotest fix.
Repro: m dist RunSettingsRoboTests ROBOTEST_FILTER=widget
Test: Robolectric test
Change-Id: I4bd4be29ac28d7532bba8aa26d70758c58bd9a0e
TreeHugger Robot [Wed, 13 Feb 2019 23:47:33 +0000 (23:47 +0000)]
Merge "Remove weird background color on stroage donut in dark mode"
TreeHugger Robot [Wed, 13 Feb 2019 23:42:22 +0000 (23:42 +0000)]
Merge "Make WakeScreen conditionally avaialable"
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
TreeHugger Robot [Wed, 13 Feb 2019 22:53:04 +0000 (22:53 +0000)]
Merge "User photo: Remove reference to Photo Gallery"
Lei Yu [Wed, 13 Feb 2019 22:43:22 +0000 (22:43 +0000)]
Merge "Update search for mobile network"
Fan Zhang [Wed, 13 Feb 2019 22:01:00 +0000 (14:01 -0800)]
Remove weird background color on stroage donut in dark mode
Bug:
124313940
Test: visual
Change-Id: Ie95c98c23bb67570418e49a1c6677d4b6809b5d2
TreeHugger Robot [Wed, 13 Feb 2019 21:45:25 +0000 (21:45 +0000)]
Merge "Change the default snoop log level to off."
Lucas Dupin [Wed, 13 Feb 2019 21:08:09 +0000 (13:08 -0800)]
Make WakeScreen conditionally avaialable
Also moving the setting closer to 'Always On'
Fixes:
124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
TreeHugger Robot [Wed, 13 Feb 2019 21:35:10 +0000 (21:35 +0000)]
Merge "Update the font family for the conditional title"
TreeHugger Robot [Wed, 13 Feb 2019 21:11:15 +0000 (21:11 +0000)]
Merge "Make card bacground grey_900 instead of 800 in dark mode"
TreeHugger Robot [Wed, 13 Feb 2019 19:56:35 +0000 (19:56 +0000)]
Merge "Set default background color for home icon."
Fan Zhang [Wed, 13 Feb 2019 19:16:00 +0000 (11:16 -0800)]
Make card bacground grey_900 instead of 800 in dark mode
Change-Id: I7ccd59984949620340ebe66710b7956acde3e381
Fixes:
124313940
Test: visual
Fan Zhang [Wed, 13 Feb 2019 18:43:46 +0000 (10:43 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82 am:
32fbf4740d
am:
798c93aafc
Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
Alex Salo [Wed, 13 Feb 2019 18:32:48 +0000 (18:32 +0000)]
Merge "Add more keywords to adaptive sleep setting"
Fan Zhang [Wed, 13 Feb 2019 18:29:46 +0000 (10:29 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82
am:
32fbf4740d
Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
Fan Zhang [Wed, 13 Feb 2019 18:16:15 +0000 (10:16 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am:
dabfd96c82
Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 17:59:40 +0000 (17:59 +0000)]
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit
910457e37a45c4c717466aadfdf9d3fcd62135d4.
Fixes:
124370422
Reason for revert: b/
124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%
22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
TreeHugger Robot [Wed, 13 Feb 2019 13:53:56 +0000 (13:53 +0000)]
Merge "Move horizontal progress bar into SettingsLib."
Mill Chen [Wed, 13 Feb 2019 08:46:47 +0000 (16:46 +0800)]
Update the font family for the conditional title
Bug:
113451905
Test: visual
Change-Id: Ic58652f4ac3af0e72308a7c2c293b2ae73eb42b6
TreeHugger Robot [Wed, 13 Feb 2019 05:44:06 +0000 (05:44 +0000)]
Merge "Fix some problems with the "Mobile network" preference"
Mark Chien [Wed, 13 Feb 2019 04:58:48 +0000 (20:58 -0800)]
[automerger skipped] Merge "Support entitlement check in DSDS" am:
e3b4e0262c am:
0ac1c323b2
am:
edc4fd30ea -s ours
am skip reason: change_id Ia4279a418dfa6cd14942b7f4d2a313156066381b with SHA1
1dd1d79d90 is in history
Change-Id: Ie6064467c68640776ec4abffdea90943880effc2
TreeHugger Robot [Wed, 13 Feb 2019 04:49:42 +0000 (04:49 +0000)]
Merge "Show app usage data for the correct cycle."
Fan Zhang [Wed, 13 Feb 2019 04:12:49 +0000 (20:12 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am:
3905ad125d am:
dd3e2c4f27
am:
80fd417a58
Change-Id: I7b55262d7e3296a29e7efe4d33a4cab70e000175
Mark Chien [Wed, 13 Feb 2019 04:06:32 +0000 (20:06 -0800)]
Merge "Support entitlement check in DSDS" am:
e3b4e0262c
am:
0ac1c323b2
Change-Id: I9249eabb454648594ac5e303405f483266eee551
Fan Zhang [Wed, 13 Feb 2019 03:33:56 +0000 (19:33 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am:
3905ad125d
am:
dd3e2c4f27
Change-Id: Ia2c1fa2eabcbe784e0d5525baf68d866f2366e6f
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am:
e3b4e0262c
Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
Fan Zhang [Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am:
3905ad125d
Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
Kiyoung Kim [Wed, 13 Feb 2019 02:35:41 +0000 (18:35 -0800)]
[automerger skipped] Merge "Schematize ADB system properties" am:
750b90a22b am:
974ace22f9
am:
de1971d7a0 -s ours
am skip reason: change_id Iec37f5f35b1452afdf7b15e9f31c4b4726127065 with SHA1
37bd3482ca is in history
Change-Id: Ic69304743c51cb1c07d20ce8d60f8d1c3f269a42
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"
Kiyoung Kim [Wed, 13 Feb 2019 02:18:16 +0000 (18:18 -0800)]
Merge "Schematize ADB system properties" am:
750b90a22b
am:
974ace22f9
Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39
TreeHugger Robot [Wed, 13 Feb 2019 02:15:54 +0000 (02:15 +0000)]
Merge "Misc ui tweaks."
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am:
750b90a22b
Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
jackqdyulei [Tue, 12 Feb 2019 22:26:47 +0000 (14:26 -0800)]
Update search for mobile network
Continue work from ag/
5991582:
1. Add search support for CDMA/GSM related preference
2. Update func getAvailabilityStatus, inside it should get all
related manager from subId, rather than default one in controller.
Bug:
117843601
Bug:
77276236
Test: RunSettingsRoboTests
Change-Id: Id72505a512269bdc5adb02e806d38ac367ce9f07
Doris Ling [Sat, 9 Feb 2019 01:22:32 +0000 (17:22 -0800)]
Show app usage data for the correct cycle.
- when launching the app data usage from the data usage list, pass the
info about the current cycle that the user is looking at, and select
the same cycle by default when the page is first launched to match the
data on the previous page.
Change-Id: Ic91bd8ee78db4d76551dff4b132c1b74d4b3c19d
Fixes:
123192721
Test: make RunSettingsRoboTests
Alex Salo [Wed, 13 Feb 2019 00:44:26 +0000 (16:44 -0800)]
Add more keywords to adaptive sleep setting
Test: manually
Bug:
111939367
Change-Id: Ib1e61dc5e743f502233b7589ae2c14b586499630
TreeHugger Robot [Wed, 13 Feb 2019 00:39:24 +0000 (00:39 +0000)]
Merge "Update spec for CardPreference"
Fan Zhang [Tue, 12 Feb 2019 20:29:49 +0000 (12:29 -0800)]
Misc ui tweaks.
- Update conditional card layout
- move action button from right side to bottom.
- Get rid of the forking between small/big screens.
- Update a few icons
Fixes:
121189136
Fixes:
124315564
Fixes:
124316920
Test: visual
Change-Id: I205d9995a2d7ed06ad9d32f3cea74f2840a28aed
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Torbjorn Eklund [Wed, 9 Jan 2019 10:09:18 +0000 (11:09 +0100)]
Close Wi-Fi Calling screen if provisioning status changes to disallow
Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.
This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.
Bug:
119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Merged-In: I2af91c3734274f0aea942a8bb894d6f4ce295354
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354
Torbjorn Eklund [Wed, 9 Jan 2019 10:09:18 +0000 (11:09 +0100)]
Close Wi-Fi Calling screen if provisioning status changes to disallow
Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.
This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.
Bug:
119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354
Doris Ling [Tue, 12 Feb 2019 23:39:46 +0000 (15:39 -0800)]
Set default background color for home icon.
- the previous change to update the adaptive home page icon has removed
the default background color for the icon. Set it back to the correct
default if we do not find any background color set from the tile.
Fixes:
124183074
Test: make RunSettingsRoboTests
Change-Id: Idafc08ff1a3b20659c5f275d1a6c404f6c7ef2c0
Fan Zhang [Tue, 12 Feb 2019 23:30:21 +0000 (23:30 +0000)]
Merge "Remove the drop shadow in Privacy screen"
Lei Yu [Tue, 12 Feb 2019 19:40:18 +0000 (19:40 +0000)]
Merge "Add intent action for BT device detail page"
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"
TreeHugger Robot [Tue, 12 Feb 2019 18:27:46 +0000 (18:27 +0000)]
Merge "Updated permission name according to API review"
Doris Ling [Tue, 12 Feb 2019 18:27:30 +0000 (18:27 +0000)]
Merge "Separate OTA data usage from SYSTEM_UID."