OSDN Git Service
Arc Wang [Thu, 21 Feb 2019 11:41:23 +0000 (19:41 +0800)]
Improve UX of Wi-Fi QR code scanner enrollee flow
1. Do not start WifiSettings after enrollee success
2. Return WifiConfiguration to the calling object after enrollee success
3. In WifiDialog, do not show scan button if Save button is not visible to users
4. Fix scanner button may not respond problem by setting listener for scanner
button of ssid field and password field
5. If SSID is assigned, only allow to enrollee for the network of assigned SSID
Bug:
124416152
Test: manual test
Change-Id: Ic5241c4767eaa8ea01782817d8302d8b0572ab36
TreeHugger Robot [Thu, 21 Feb 2019 03:05:02 +0000 (03:05 +0000)]
Merge "Replace deprecated KeyguardManager API with new BiometricPrompt one"
Kiyoung Kim [Thu, 21 Feb 2019 01:29:45 +0000 (17:29 -0800)]
[automerger skipped] Merge "Schematize Crypto system properties" am:
b837a44716 am:
a078a02c42
am:
9602f7eb0b -s ours
am skip reason: change_id I65a6ce1a682687702f4c8b5c2e054eaaf91c389b with SHA1
3737da3ae6 is in history
Change-Id: I1bfc2de7781bb2036c68daae22d45b3738c4b30e
Kiyoung Kim [Thu, 21 Feb 2019 01:07:08 +0000 (17:07 -0800)]
Merge "Schematize Crypto system properties" am:
b837a44716
am:
a078a02c42
Change-Id: Ie498a453d85651904d98b0501d895e15cabfb317
Kiyoung Kim [Thu, 21 Feb 2019 00:34:01 +0000 (16:34 -0800)]
Merge "Schematize Crypto system properties"
am:
b837a44716
Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Fan Zhang [Wed, 20 Feb 2019 23:10:17 +0000 (23:10 +0000)]
Merge "Update char limit"
Fan Zhang [Wed, 20 Feb 2019 23:07:28 +0000 (15:07 -0800)]
Update char limit
Fixes:
124535061
Test: manual
Change-Id: I17a3c7b93b09f6f6d02ab36df3dd9a16bebd7294
TreeHugger Robot [Wed, 20 Feb 2019 22:56:29 +0000 (22:56 +0000)]
Merge "Add event logging for changing SmsDefaultDialog window attr"
TreeHugger Robot [Wed, 20 Feb 2019 21:31:21 +0000 (21:31 +0000)]
Merge "Use MATCH_ALL to query available browsers."
Fan Zhang [Wed, 20 Feb 2019 21:13:41 +0000 (13:13 -0800)]
Add event logging for changing SmsDefaultDialog window attr
Bug:
120484087
Test: manual
Change-Id: Ia5b00f79f2e54cb40377abb18c1ac07891020ae2
Xin Li [Wed, 20 Feb 2019 20:16:32 +0000 (12:16 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours am:
92fc138524 -s ours
am:
b637de1cb8 -s ours
am skip reason: subject contains skip directive
Change-Id: I23b85158470a5d10ddb6a559c8f2d2fcd0154de6
Xin Li [Wed, 20 Feb 2019 19:47:29 +0000 (11:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours
am:
92fc138524 -s ours
am skip reason: subject contains skip directive
Change-Id: I1e1a98a476c0fcda84f8d5c1d245e296b0354708
Hai Zhang [Wed, 20 Feb 2019 19:23:15 +0000 (11:23 -0800)]
Use MATCH_ALL to query available browsers.
Browser intent resolution has been special for a long time, and we
need to pass MATCH_ALL to get all the candidates, then do manual
filtering later.
Bug:
116216651
Test: manual
Change-Id: I5e9b7b907005f73b7c54c3253c872d85ef7c4863
TreeHugger Robot [Wed, 20 Feb 2019 19:06:42 +0000 (19:06 +0000)]
Merge "Add pref for notification swipe direction"
Xin Li [Wed, 20 Feb 2019 19:06:41 +0000 (11:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am:
d4716c1a62 -s ours
am skip reason: subject contains skip directive
Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9
Xin Li [Wed, 20 Feb 2019 18:16:18 +0000 (10:16 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours am:
a99376f647 -s ours
am:
3003b4b39c -s ours
am skip reason: subject contains skip directive
Change-Id: I3d5eeea407f925dbc342ff8c059555c76c05fa86
Xin Li [Wed, 20 Feb 2019 17:29:00 +0000 (09:29 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours
am:
a99376f647 -s ours
am skip reason: subject contains skip directive
Change-Id: I70f7a0afed0ff3124670ac7da3a5a4d643b07970
Xin Li [Wed, 20 Feb 2019 16:52:26 +0000 (08:52 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am:
9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Julia Reynolds [Wed, 20 Feb 2019 15:33:15 +0000 (10:33 -0500)]
Add pref for notification swipe direction
And move that and other settings under an 'advanced' category
Test: robotests
Fixes:
124099692
Change-Id: I89df276a8bc1cd56ce8530239ca02b2c4b43fa65
TreeHugger Robot [Wed, 20 Feb 2019 12:45:26 +0000 (12:45 +0000)]
Merge changes from topic "Wi-Fi DPP error code handling"
* changes:
Fix camera stop forever after error occurs while sharing or adding network
Handle different error codes in DPP
TreeHugger Robot [Wed, 20 Feb 2019 10:48:35 +0000 (10:48 +0000)]
Merge "Update char limit for DND conditional"
Mill Chen [Wed, 20 Feb 2019 08:16:35 +0000 (16:16 +0800)]
Update char limit for DND conditional
Increasing the character limit for the "Phone muted" to 38 in the DND
condition.
Bug:
124784648
Test: rebuild
Change-Id: I46496ee60f6757f477b0d0bbd021c43234f83222
Arc Wang [Fri, 15 Feb 2019 06:21:26 +0000 (14:21 +0800)]
Fix camera stop forever after error occurs while sharing or adding network
Restart QrCamera decoding task after Wi-Fi DPP handshake fail or
Wi-Fi connection fail.
Bug:
124128539
Test: manual test
Change-Id: I6d916ed1378f50038089e2c1e2870915ca083d68
Arc Wang [Wed, 13 Feb 2019 12:11:25 +0000 (20:11 +0800)]
Handle different error codes in DPP
Show error message for corresponding Wi-Fi DPP error code. And
1. To update error message only from each fragment,
remove some callbacks which calls from fragment to activity.
2. After clicking 'Share Wi-Fi' button, hide it before Wi-Fi DPP handshake completes.
3. Show 'Done' button for some error codes.
4. Use ViewModel to call startEasyConnectAsConfiguratorInitiator and
startEasyConnectAsEnrolleeInitiator because a lifecycle object
does not receive an Executor callback after configurator change.
5. In WifiDppQrCodeScannerFragment, show an error message for 10s instead of 2s
since new added error messages may carry more information.
6. Show a different error message for enrollee handshake success but Wi-Fi
connection fail case.
7. stop camera when scanned a Wi-Fi DPP QR code for enrollee.
8. In QR code scanner fragment, support to show error message after
configuration change.
Bug:
124247872
Bug:
124491247
Test: manual test
atest WifiQrCodeTest
atest WifiDppConfiguratorActivityTest
atest WifiDppEnrolleeActivityTest
atest WifiDppQrCodeGeneratorFragmentTest
atest WifiDppQrCodeScannerFragmentTest
atest WifiNetworkListFragmentTest
atest WifiDppChooseSavedWifiNetworkFragmentTest
Change-Id: Id130215e9ddafac8bc4c68238deda48ce99b4255
Arc Wang [Wed, 20 Feb 2019 05:45:51 +0000 (13:45 +0800)]
Replace deprecated KeyguardManager API with new BiometricPrompt one
Use BiometricPrompt to replace KeyguardManager#createConfirmDeviceCredentialIntent
Bug:
124249685
Test: manual test
Change-Id: I7a05b8f1b08471cf9f09b3d4ce1bedc7cd529e72
TreeHugger Robot [Wed, 20 Feb 2019 03:55:40 +0000 (03:55 +0000)]
Merge "Add developer menu to enable/disable ART verifier."
Xiangyu/Malcolm Chen [Tue, 19 Feb 2019 21:04:01 +0000 (21:04 +0000)]
Merge "Correct behavior of "Mobile data" button on opportunistic subscriptions."
Malcolm Chen [Tue, 12 Feb 2019 23:55:12 +0000 (15:55 -0800)]
Correct behavior of "Mobile data" button on opportunistic subscriptions.
A check was added earlier to make sure in DSDS mode only one sub
shows data on, which is not true for opportunistic subscriptions. For
them, it should always be on (enforced by Telephony) and be disabled
as it shouldn't be turned off.
Bug:
124331860
Bug:
124683219
Test: manual, robolectric
Change-Id: I53c8d881ff71ad25c418085d3eee63e55c786b8f
TreeHugger Robot [Tue, 19 Feb 2019 12:25:17 +0000 (12:25 +0000)]
Merge "Add a util method of creating Icon with Drawable"
Jason Chiu [Wed, 13 Feb 2019 08:07:57 +0000 (16:07 +0800)]
Add a util method of creating Icon with Drawable
- Add a util method to help create Icon with Drawable so that
users don't need to handle bitmaps
- Add support for creating with ColorDrawable
Test: robotest
Fixes:
124407373
Change-Id: I1897256821cc804a5e599d967feb84a3bcd689a9
TreeHugger Robot [Tue, 19 Feb 2019 05:53:44 +0000 (05:53 +0000)]
Merge "Visual update: update the icons for suggestions"
TreeHugger Robot [Tue, 19 Feb 2019 03:48:53 +0000 (03:48 +0000)]
Merge "Fix janky in App info screen"
Xin Li [Mon, 18 Feb 2019 23:58:44 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
Alex Buynytskyy [Sat, 26 Jan 2019 00:22:00 +0000 (16:22 -0800)]
Add developer menu to enable/disable ART verifier.
The new developer option modifies the global setting "art_verifier_verify_debuggable"; it allows to check if the bytecode of the Debuggable Apps is correct, e.g. if it's using the correct APIs.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=development
Bug:
124403695
Change-Id: I8e721d62c5ca6fb5f26d9b989a8242eece8f55ab
Mill Chen [Wed, 23 Jan 2019 02:44:39 +0000 (10:44 +0800)]
Visual update: update the icons for suggestions
- remove blue tint
- add the icons of suggestions for contextual homepage
Bug:
122310542
Test: visual, rebuild
Change-Id: I2bac139669a4218455195aebeba83d1649184895
tmfang [Mon, 18 Feb 2019 03:08:24 +0000 (11:08 +0800)]
Fix janky in App info screen
If a Recycle view inside in a NestedScrollView,
The times of calling recyclerView#onCreateViewHolder()
is requal to its data set.
When there are large set of apps need to be shown,
RecyclerView will need to take many time to call
onCreateViewHolder for each item.
So, it causes the screen is janky or freeze UI when page
is loading large data set.
For now, we get rid of NestedScrollView, just use RecycleView
and AppBarLayout to have same bahavior for spinner.
Fixes:
124384314
Fixes:
123036231
Fixes:
122964660
Fixes:
123088178
Test: 1. Select show system in App info screen. Observe whether there
is any janky.
2. Select show system in App info screen, and then change device
orientation. Observer whether there is any janky.
3. Go to Settings > Apps & notifications> Advanced > Special app access >
Select "battery optimization", and then Tap drop down and select "all
apps". Observe whether ther is any janky.
Change-Id: Icd65e91eec3b32476d80cc12e9c4baa71151306a
Yanting Yang [Mon, 18 Feb 2019 08:25:23 +0000 (16:25 +0800)]
Remove deprecated EXCLUSIVE field from proto
Fixes:
123560880
Test: robotests
Change-Id: I6ff184dc5998d1e8eadfbfa16c8c7a85ebd75d98
TreeHugger Robot [Mon, 18 Feb 2019 06:19:41 +0000 (06:19 +0000)]
Merge "[Network Connection] Implement "show all" button for NetworkRequestDialog"
TreeHugger Robot [Mon, 18 Feb 2019 04:29:26 +0000 (04:29 +0000)]
Merge "[Mac Randomization] Fix MAC randomization option does not work when ephemeral newtork"
TreeHugger Robot [Mon, 18 Feb 2019 04:13:39 +0000 (04:13 +0000)]
Merge "Fix [RTL] Wifi QR Scanner option overlaps wifi Password text"
cosmohsieh [Wed, 13 Feb 2019 09:11:16 +0000 (17:11 +0800)]
[Network Connection] Implement "show all" button for
NetworkRequestDialog
Add "show all" button to NetworkRequest dialog to let user be able to
show all AccessPoints of onMatch() callback.
Bug:
117985692
Test: atest NetworkRequestDialogFragmentTest
Change-Id: I604083fd0f3ea98208d860a327733699cd4664d7
TreeHugger Robot [Mon, 18 Feb 2019 03:04:05 +0000 (03:04 +0000)]
Merge "Add progress bar for Privacy screen"
cosmohsieh [Tue, 29 Jan 2019 06:50:43 +0000 (14:50 +0800)]
[Mac Randomization] Fix MAC randomization option does not work when
ephemeral newtork
WifiConfiguration is only available when saved network. So ephemeral
newtork could not have wifi config to config wifi setting. In this
situation, making option be not selectable.
Bug:
122919564
Test: atest WifiPrivacyPreferenceControllerTest
Change-Id: I8a2a1c36ec6d41a6f912da29a8b17bc2e43d9a27
Yanting Yang [Mon, 18 Feb 2019 02:46:04 +0000 (02:46 +0000)]
Merge "Hide "Pair new device" from connected device slice"
TreeHugger Robot [Mon, 18 Feb 2019 02:42:33 +0000 (02:42 +0000)]
Merge "Remove feature flags of WiFi Sharing feature"
TreeHugger Robot [Sat, 16 Feb 2019 02:30:16 +0000 (02:30 +0000)]
Merge "Fix failing robotest"
TreeHugger Robot [Sat, 16 Feb 2019 00:38:28 +0000 (00:38 +0000)]
Merge "Move some slice related api out of BasePreferenceController"
Fan Zhang [Fri, 15 Feb 2019 23:46:58 +0000 (15:46 -0800)]
Fix failing robotest
Fixes:
124531152
Test: robotests
Change-Id: I4442ae543b062ef17b4bfd828134ede879d2b22d
TreeHugger Robot [Fri, 15 Feb 2019 23:28:32 +0000 (23:28 +0000)]
Merge "Remove side padding for settings items in bigger screen."
TreeHugger Robot [Fri, 15 Feb 2019 22:46:15 +0000 (22:46 +0000)]
Merge "Fix doubling of channel listing"
TreeHugger Robot [Fri, 15 Feb 2019 22:36:12 +0000 (22:36 +0000)]
Merge "Fix legacy app notification pages"
Fan Zhang [Thu, 14 Feb 2019 23:06:23 +0000 (15:06 -0800)]
Move some slice related api out of BasePreferenceController
And share with CustomSliceable.
Bug:
121150258
Test: rebuild
Change-Id: Ia5aed9c156fb168c1f001da6e37f7f12f191b385
Fan Zhang [Fri, 15 Feb 2019 22:14:22 +0000 (22:14 +0000)]
Merge "Move registered slice set from settings to settingslib."
TreeHugger Robot [Fri, 15 Feb 2019 21:49:23 +0000 (21:49 +0000)]
Merge "Update some string char limits"
Doris Ling [Fri, 15 Feb 2019 21:33:00 +0000 (13:33 -0800)]
Remove side padding for settings items in bigger screen.
Fixes:
110804029
Test: visual in emulator with tablet skin
Change-Id: Ib569731d8cff088c6d110c4ae9d43a7609416238
Julia Reynolds [Fri, 15 Feb 2019 20:15:31 +0000 (15:15 -0500)]
Fix doubling of channel listing
Test: toggle a notification group on/off
Change-Id: Ia93cf8084aee0c886a591301cba764975e5e0147
Fixes:
124384280
Antony Sargent [Fri, 15 Feb 2019 19:37:05 +0000 (11:37 -0800)]
Update some string char limits
We got a bug requesting slightly longer character limits for of the some
new strings used when displaying information in multi-SIM mode.
Bug:
124474015
Test: n/a
Change-Id: I706586b2fc97ae8e6f0e809d2b3b168c7a9353c1
TreeHugger Robot [Fri, 15 Feb 2019 19:09:08 +0000 (19:09 +0000)]
Merge "Check flag to see whether to show accessibility usage dialog."
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"
Julia Reynolds [Fri, 15 Feb 2019 18:15:50 +0000 (13:15 -0500)]
Fix legacy app notification pages
Test: view legacy app notification page
Change-Id: Id0d7ac53bc0d9e4d7084bea7ff44d4d8a082cb74
Fixes:
124453411
Joel Galenson [Fri, 15 Feb 2019 16:12:08 +0000 (08:12 -0800)]
Check flag to see whether to show accessibility usage dialog.
Test: Manually set/unset flag, see/don't see dialog.
Test: atest AccessibilityUsagePreferenceControllerTest
Change-Id: I214cf0bf4c67889f48e43fdf774a943dd11e6c34
TreeHugger Robot [Fri, 15 Feb 2019 15:42:35 +0000 (15:42 +0000)]
Merge "Update the summary for DND conditional"
Yanting Yang [Fri, 15 Feb 2019 13:03:54 +0000 (21:03 +0800)]
Hide "Pair new device" from connected device slice
Fixes:
124460897
Test: visual, robotests
Change-Id: Id702bf77eacf29d831e00f56d0b1ab9c1f945fbb
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
Arc Wang [Fri, 15 Feb 2019 08:30:17 +0000 (16:30 +0800)]
Fix [RTL] Wifi QR Scanner option overlaps wifi Password text
Use android:layout_alignParentStart & android:layout_alignParentEnd
to fix the RTL issue. And refine code of the scanner button.
Bug:
123923904
Test: manual test
Change-Id: I85491b99d22ec303e370422a81a43fc203b695fa
Johnson Lu [Wed, 13 Feb 2019 03:50:11 +0000 (11:50 +0800)]
Remove feature flags of WiFi Sharing feature
Bug:
120744414
Test: Manual
Change-Id: I655ebb8d149d0976063845478bc667cc4d72d96d
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
tmfang [Tue, 12 Feb 2019 10:23:20 +0000 (18:23 +0800)]
Add progress bar for Privacy screen
We show up top linear progress bar
when Settings is querying permission usage data.
Test: visual, robotest
Fixes:
123539793
Change-Id: I350068856d1708eb054d2a205d9ca857214891ce
Kiyoung Kim [Tue, 22 Jan 2019 01:19:29 +0000 (10:19 +0900)]
Schematize Crypto system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug:
117924132
Test: m -j
Change-Id: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Merged-In: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
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 22:31:11 +0000 (14:31 -0800)]
Move registered slice set from settings to settingslib.
Bug:
121150258
Test: robotests
Change-Id: I32263de9a755e8902c820fda36096b821a293bcb
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"