Commit Graph

50289 Commits

Author SHA1 Message Date
Yanting Yang
53656a1749 Hide "Pair new device" from connected device slice
Fixes:124460897
Test: visual, robotests
Change-Id: Id702bf77eacf29d831e00f56d0b1ab9c1f945fbb
2019-02-15 21:03:54 +08:00
Mill Chen
09fedbf7ec 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
2019-02-15 18:37:25 +08:00
Arc Wang
07ced72e67 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
2019-02-15 16:30:17 +08:00
Johnson Lu
3a5d9020e8 Remove feature flags of WiFi Sharing feature
Bug: 120744414
Test: Manual
Change-Id: I655ebb8d149d0976063845478bc667cc4d72d96d
2019-02-15 16:14:54 +08:00
Xin Li
b87dfdc189 [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
2019-02-14 21:49:04 -08:00
Android Build Merger (Role)
fedb8d4dd1 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" 2019-02-15 05:28:05 +00:00
TreeHugger Robot
63e0409cbb Merge "Use BiometricPrompt description field for CC description instead" 2019-02-15 05:14:46 +00:00
Xin Li
e52c18a41c [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
2019-02-14 21:08:49 -08:00
TreeHugger Robot
2f6de9967b Merge "Add null check for CarrierConfig" 2019-02-15 03:41:25 +00:00
jackqdyulei
ef3b364728 Update battery summary
When it is charging, show "5% - charging"(not only "5%")

Bug: 112013485
Test: RunSettingsRoboTests
Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc
2019-02-14 19:11:10 -08:00
tmfang
64f5b796c2 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
2019-02-15 11:01:10 +08:00
Kiyoung Kim
9c9b9394de 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
2019-02-15 02:30:30 +00:00
Kevin Chyn
200162b06a 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
2019-02-14 17:43:45 -08:00
Xin Li
82b262afbd [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
2019-02-14 17:18:04 -08:00
Fan Zhang
0e060dad97 Merge "Do not allow draw on top for default sms picker." 2019-02-15 00:51:12 +00:00
Fan Zhang
9d46e1fdfe Do not allow draw on top for default sms picker.
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
2019-02-14 16:07:37 -08:00
Lei Yu
6344182d31 Merge "Adjust layout padding for SlicePreference" 2019-02-15 00:06:59 +00:00
Fan Zhang
1031901867 Move registered slice set from settings to settingslib.
Bug: 121150258
Test: robotests
Change-Id: I32263de9a755e8902c820fda36096b821a293bcb
2019-02-14 15:16:53 -08:00
Fan Zhang
ed2db4aaa1 Merge "Mass clean up: don't cast class when not needed." 2019-02-14 23:13:44 +00:00
Xin Li
44ace71846 [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
2019-02-14 14:41:06 -08:00
jackqdyulei
e642ae67b9 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
2019-02-14 14:29:48 -08:00
Xin Li
f6aad2aee8 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:39 +00:00
Maurice Lam
59f1c1ad70 Revert "Revert "Remove TemplateLayout that is not for external use""
This reverts commit 0111db7181.

Reason for revert: Roll forward

Change-Id: I0a7642915dbf3b16115456ab9c264cf1acf93d01
2019-02-14 22:04:30 +00:00
Maurice Lam
a670f752ce Merge "Revert "Remove TemplateLayout that is not for external use"" 2019-02-14 22:03:58 +00:00
Maurice Lam
0111db7181 Revert "Remove TemplateLayout that is not for external use"
This reverts commit 39b02386f7.

Reason for revert: b/124450605

Change-Id: I3b2d66c87dc645da0d4e8ded798a1b80381523cf
2019-02-14 22:01:10 +00:00
Brad Ebinger
bab28e0e8e [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
2019-02-14 13:23:41 -08:00
Brad Ebinger
9f2b104953 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am: db7da4cba8
am: ee4a5291a1

Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
2019-02-14 13:19:37 -08:00
Brad Ebinger
ee4a5291a1 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am: db7da4cba8

Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
2019-02-14 13:15:44 -08:00
TreeHugger Robot
2bd74f7e50 Merge "Add accessibility usage preference to the Privacy screen." 2019-02-14 21:04:32 +00:00
Brad Ebinger
db7da4cba8 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 21:01:05 +00:00
TreeHugger Robot
1de961d9ef Merge "Apply new slice attributes to customize layout" 2019-02-14 20:43:23 +00:00
jackqdyulei
26a5023d7f 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
2019-02-14 12:39:36 -08:00
Fan Zhang
7db118e367 Mass clean up: don't cast class when not needed.
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
2019-02-14 12:26:09 -08:00
Brad Ebinger
09285d72bd Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 18:54:55 +00:00
TreeHugger Robot
3fd17955e7 Merge "Updated screen lock type picker footer strings" 2019-02-14 18:24:40 +00:00
TreeHugger Robot
2f76f51300 Merge "Fix only one "active" HA showing under Accessibility Settings" 2019-02-14 18:03:19 +00:00
Bernard Chau
4ef6c99989 Updated screen lock type picker footer strings
Bug: 111173457
Test: N/A
Change-Id: I5a4fe3d6e35cd8ae068f2235faa302c8a5c03c97
2019-02-14 11:33:12 +00:00
Leon Liao
a165020047 Update education strings on A11y 'Time to read' UI
Correction to 'Time to read' UI education strings.

Bug: 119283926
Test: atest AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests
Change-Id: I52d0902a2151252803ee694f678aeebbce0b3151
2019-02-14 18:38:54 +08:00
Jason Chiu
862bcc7787 Apply new slice attributes to customize layout
Fixes: 114807643
Test: robotest
Change-Id: I6c3975f08268cb831627f63c241428ae4574af1f
2019-02-14 18:16:25 +08:00
Xin Li
d61c2adf09 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
2019-02-14 00:03:58 -08:00
markchien
72ba39cdf4 Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627 am: 2ee5beaa32
am: c77ee11e4e

Change-Id: Ib14b4a7b3a5b8eb23c7229318ecd785605e1a4f0
2019-02-13 22:43:11 -08:00
markchien
c77ee11e4e Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627
am: 2ee5beaa32

Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
2019-02-13 22:39:00 -08:00
markchien
2ee5beaa32 Merge "Fix wrong TetherProvisioningActivity definition"
am: f1e3e9d627

Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627 Merge "Fix wrong TetherProvisioningActivity definition" 2019-02-14 06:19:30 +00:00
TreeHugger Robot
178d79dd66 Merge "Check for null before invoking finish()" 2019-02-14 04:58:05 +00:00
Pasty Chang
3c991847aa Merge "Remove TemplateLayout that is not for external use" 2019-02-14 04:03:43 +00:00
markchien
8c713fc756 Fix wrong TetherProvisioningActivity definition
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
2019-02-14 03:24:52 +00:00
Malcolm Chen
0a36e91a49 Don't show hidden subscriptions.
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
2019-02-14 02:54:31 +00:00
Kevin Chyn
ee922128e4 Check for null before invoking finish()
Fixes: 124406109

Test: manual
Change-Id: Idee87c060ffd84395355ccdc5248166f1a6aeaf0
2019-02-13 18:23:08 -08:00
TreeHugger Robot
57b076fa76 Merge "Add logging for SettingsPanels" 2019-02-14 01:36:30 +00:00