PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,900 Commits 1 Branch 0 Tags
334f0a1e2e5ec0a4f3cb4d42df8aa60b64494548
Commit Graph

49900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
334f0a1e2e Merge "Fix failing robotest" 2019-02-16 02:30:16 +00:00
TreeHugger Robot
0b5ae6791c Merge "Move some slice related api out of BasePreferenceController" 2019-02-16 00:38:28 +00:00
Fan Zhang
9859b8b0b0 Fix failing robotest 
Fixes: 124531152
Test: robotests
Change-Id: I4442ae543b062ef17b4bfd828134ede879d2b22d
 2019-02-15 16:15:39 -08:00
TreeHugger Robot
bad926c890 Merge "Remove side padding for settings items in bigger screen." 2019-02-15 23:28:32 +00:00
TreeHugger Robot
6dca5ef8e9 Merge "Fix doubling of channel listing" 2019-02-15 22:46:15 +00:00
TreeHugger Robot
2195fd721a Merge "Fix legacy app notification pages" 2019-02-15 22:36:12 +00:00
Fan Zhang
45f961b624 Move some slice related api out of BasePreferenceController 
And share with CustomSliceable.

Bug: 121150258
Test: rebuild
Change-Id: Ia5aed9c156fb168c1f001da6e37f7f12f191b385
 2019-02-15 14:21:10 -08:00
Fan Zhang
1aa75aa71a Merge "Move registered slice set from settings to settingslib." 2019-02-15 22:14:22 +00:00
TreeHugger Robot
ee0c55bd23 Merge "Update some string char limits" 2019-02-15 21:49:23 +00:00
Doris Ling
e5df0b1934 Remove side padding for settings items in bigger screen. 
Fixes: 110804029
Test: visual in emulator with tablet skin
Change-Id: Ib569731d8cff088c6d110c4ae9d43a7609416238
 2019-02-15 13:33:00 -08:00
Julia Reynolds
0b6d652d20 Fix doubling of channel listing 
Test: toggle a notification group on/off
Change-Id: Ia93cf8084aee0c886a591301cba764975e5e0147
Fixes: 124384280
 2019-02-15 20:42:24 +00:00
Antony Sargent
a72540089e 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
 2019-02-15 11:37:05 -08:00
TreeHugger Robot
3f95dfefd5 Merge "Check flag to see whether to show accessibility usage dialog." 2019-02-15 19:09:08 +00:00
Maurice Lam
082e7967dc Merge "Revert "Revert "Remove TemplateLayout that is not for external use""" 2019-02-15 18:55:34 +00:00
Lei Yu
755a7d5b65 Merge "Update battery summary" 2019-02-15 18:26:56 +00:00
Julia Reynolds
7d914f509a Fix legacy app notification pages 
Test: view legacy app notification page
Change-Id: Id0d7ac53bc0d9e4d7084bea7ff44d4d8a082cb74
Fixes: 124453411
 2019-02-15 13:15:50 -05:00
Joel Galenson
858fa64d4a 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
 2019-02-15 08:16:33 -08:00
TreeHugger Robot
9232a4a147 Merge "Update the summary for DND conditional" 2019-02-15 15:42:35 +00: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
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
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