Commit Graph

59130 Commits

Author SHA1 Message Date
TreeHugger Robot
6f844295f2 Merge "Update styles suggestion title to be generic" 2020-02-08 08:57:27 +00:00
PETER LIANG
dbd7eaa17d Merge "Update the rich content UI to meet the UX design version 2." 2020-02-08 08:17:28 +00:00
Peter_Liang
68d701db97 Update the rich content UI to meet the UX design version 2.
1. Using the footerPreference component for the interface
android:desription.
2. Remove the redundant and unused codes.
3. Remove the ripple effect for AnimatedImagePreference.

Bug: 142532186
Test: manual test
Change-Id: I547ed7611b40d8b7bee4c4350b00bd4987768950
2020-02-08 13:49:06 +08:00
Automerger Merge Worker
ff63b8303c [automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c am: 36bc7f92b1 -s ours
am skip reason: Change-Id I4bf1341f972639829cd9fc64370018127460a65f with SHA-1 698e2ed95e is in history

Change-Id: Ibef0c7346a78a7723c36db60259976189c0ba52a
2020-02-08 05:28:40 +00:00
Automerger Merge Worker
36bc7f92b1 Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008
2020-02-08 05:07:12 +00:00
Automerger Merge Worker
4a121f066c Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e
Change-Id: I90ba1b6e6f530b069d504a045d7832a8cf9e5833
2020-02-08 04:46:59 +00:00
Zoey Chen
5503c8ea9e Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" 2020-02-08 04:25:32 +00:00
Automerger Merge Worker
64a941f8ad [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901 am: c8e044de48 -s ours
am skip reason: subject contains skip directive

Change-Id: I1cbf9dd3dd4dcb554749edfe43549632d18575cd
2020-02-08 02:23:21 +00:00
Automerger Merge Worker
4d7adc1152 [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4 am: b946cbd92c -s ours
am skip reason: subject contains skip directive

Change-Id: I948c7169c1049688fb291d75854260e6d47781ab
2020-02-08 02:22:10 +00:00
Automerger Merge Worker
c8e044de48 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901
Change-Id: I07988bb74d92486adfddb88142c0b3f92d2110ba
2020-02-08 01:57:10 +00:00
Automerger Merge Worker
b946cbd92c DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4
Change-Id: Id79f92e9ea099ca850428be4748f24cd28ea30e0
2020-02-08 01:55:27 +00:00
Automerger Merge Worker
cd27b5b901 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9
Change-Id: I58a086074b45bedb194752973412dc4c1e6cd1ab
2020-02-08 01:48:45 +00:00
Automerger Merge Worker
abf86230e4 DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f
Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1
2020-02-08 01:38:43 +00:00
Treehugger Robot
af463b86c9 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
TreeHugger Robot
ba4ab078f2 Merge "Accessibility Service & Shortcut Redesign - Primary action - toggle button design" 2020-02-07 22:57:27 +00:00
Bill Peckham
f78295c11a Merge "Revert "Use system-api lib to get badged, shadowed icons(2/n)"" 2020-02-07 22:27:34 +00:00
Bill Peckham
94b8055f1c Revert "Use system-api lib to get badged, shadowed icons(2/n)"
This reverts commit dbecbe6f61.

Reason for revert: b/149112222

Change-Id: I11981b2daacf8b07177fe906d88de05ca40810c1
2020-02-07 21:52:25 +00:00
Roshan Pius
65291297a9 Settings: Use new API for wifi wakeup feature toggle
Bug: 148514485
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Test: Verified wifi wakeup feature toggle in wifi settings.
Change-Id: I1e7c0b3ca053a9b7d6105cad16362df38517b51e
2020-02-07 12:33:18 -08:00
Beth Thibodeau
58c0a4c38f Update styles suggestion title to be generic
Fixes: 148944501
Test: mp settingsg

Change-Id: Ifb55ac9ce1bfa45ab1c26a696558b2626e4353ee
2020-02-07 14:08:30 -05:00
Fabian Kozynski
3c77bd3631 Merge "BOOLEAN_TILE to TOGGLEABLE_TILE in dev tiles" 2020-02-07 17:52:22 +00:00
Fabian Kozynski
e47b82b9a7 BOOLEAN_TILE to TOGGLEABLE_TILE in dev tiles
Test: manual
Fixes: 147287512
Change-Id: I1bce1d8229ba2b7762387ea4df38bf4ba750c426
2020-02-07 10:11:57 -05:00
Julia Reynolds
976a07baa6 Separate conversations from channels
Test: atest
Bug: 137397357
Change-Id: I15c360e8ef89f9fcb8db92678dd02a2c6fe083c5
2020-02-07 09:45:30 -05:00
Roshan Pius
c1313b41a5 Merge "Settings: Use new API for scan throttle toggle" 2020-02-07 13:39:55 +00:00
Automerger Merge Worker
2457f719e3 [automerger skipped] Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 am: b29e64ace1 -s ours
am skip reason: Change-Id Ib5cc06cdbfd2fa70cd115d70337b21500e362da6 with SHA-1 7164275393 is in history

Change-Id: I71905b759fcd47d4cab1f24dc6cf989d97ceab8a
2020-02-07 13:00:42 +00:00
Automerger Merge Worker
b29e64ace1 Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
2020-02-07 12:54:50 +00:00
menghanli
6eb3912f31 Accessibility Service & Shortcut Redesign - Primary action - toggle button design
Implements DividerSwitchPreference to replace ToggleSwitch

Bug: 142528112
Test: Manual test

Change-Id: I0d80d16bfa941f7ee333a2c5680a25a26c42809d
2020-02-07 20:49:13 +08:00
TreeHugger Robot
ee1bdcc010 Merge "Support autoclick secondary action (2/n)" 2020-02-07 12:25:10 +00:00
TreeHugger Robot
cdd797e2bd Merge "Use system-api lib to get badged, shadowed icons(2/n)" 2020-02-07 11:50:41 +00:00
ChenJean
62aab02fc5 Support autoclick secondary action (2/n)
Add LayoutPreference to support new seekbar design.

Bug: 146019277
Test: manual
Change-Id: I8bfe3ca1ccee833fb941076ff33e7536392b90f4
2020-02-07 19:16:10 +08:00
Kholoud Mohamed
83589187ae Merge "Add settings page to control cross profile appop" 2020-02-07 11:14:08 +00:00
Tsung-Mao Fang
dbecbe6f61 Use system-api lib to get badged, shadowed icons(2/n)
In order to prevent DoS attack from icon size, we're using
a system lib to help convert any loaded drawable into a flattened
bitmap with an appropriate size.

Test: Open recent app screen and then no crash
Bug: 33646131
Change-Id: Ib7eae56e19cd86667bd63b6061000c6a92deaf3b
2020-02-07 18:45:45 +08:00
Menghan Li
da645144e0 Merge "Update the shortcut design strings." 2020-02-07 10:42:00 +00:00
Menghan Li
203b9e974f Merge "Fix “Magnify” functionality broken from Vision Settings." 2020-02-07 09:41:15 +00:00
menghanli
4a7734eca3 Fix “Magnify” functionality broken from Vision Settings.
Root cause: Settings items are removed from magnification, so can not call its API in SUW. Will lead to NPE.

Bug: 149071325
Test: Manual Test
Change-Id: Icc75758ddbf330fa6b68d39699a473ac94f97fa3
2020-02-07 08:39:22 +00:00
Edgar Wang
4af4f276bd Merge "Make the fragment title can’t searchable" 2020-02-07 08:07:01 +00:00
Jimmy Chen
c33604999f Merge "Wifi: update p2p API usage in settings" 2020-02-07 06:54:57 +00:00
Bonian Chen
ae405030f7 Merge "[Settings] Apply ImsQueryProvisioningStat to WFC" 2020-02-07 06:49:16 +00:00
paulhu
08efd36bf2 Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS
Bug: 149068177
Test: Build, Flash, manual test.
Change-Id: If01bdeb7f6ea021cc28c462360a969985882348b
2020-02-07 14:42:08 +08:00
zoey chen
9d49a395c3 [Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
2020-02-07 14:31:08 +08:00
menghanli
4705d87c4a Update the shortcut design strings.
Bug: 148837311
Test: Manual test

Change-Id: Iac96b3f36e4298aea36bbde5632f701ad1e9572d
2020-02-07 14:23:22 +08:00
timhypeng
b545599933 Implement remote media preference in Sound Setting
-Add test cases

Bug: 147395289
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a3a2312e5f777cc22afb7a33df52afcc7707dc7
2020-02-07 14:21:16 +08:00
Stanley Wang
dc23eaea21 Merge "Fix the 'Google play system update' button is not actionable." 2020-02-07 05:48:30 +00:00
Automerger Merge Worker
aa461b0910 [automerger skipped] Merge "Update profile api" am: 4f4c05addb am: 7425059fc9 am: 9e876f6919 -s ours
am skip reason: Change-Id Ib875d126be0d8483fb539e7ba950242a4f38cf81 with SHA-1 eba97c8ce6 is in history

Change-Id: I843469de2e58a496add95596e03226eb37120fc2
2020-02-07 03:31:25 +00:00
Automerger Merge Worker
95d9d345ad [automerger skipped] Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce am: f227708d08 am: 42d5890a96 -s ours
am skip reason: Change-Id I974df385d956dbff10aac874487d07d626992e4b with SHA-1 8873444847 is in history

Change-Id: I0687f3940c4371fb3592dd4d5aa89192cc96db26
2020-02-07 03:31:00 +00:00
tim peng
5a05f5f564 Merge "Update preferenceSlice layout rule for new volume panel design" 2020-02-07 03:26:24 +00:00
TreeHugger Robot
ddb7746f1b Merge "Modify Secure NFC function naming" 2020-02-07 03:24:42 +00:00
Automerger Merge Worker
9e876f6919 Merge "Update profile api" am: 4f4c05addb am: 7425059fc9
Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc
2020-02-07 03:11:42 +00:00
Automerger Merge Worker
42d5890a96 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce am: f227708d08
Change-Id: I3dc450cb4a91c496e6a7c8306e4cd4a6b4a19a5b
2020-02-07 03:11:15 +00:00
Automerger Merge Worker
7425059fc9 Merge "Update profile api" am: 4f4c05addb
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
2020-02-07 02:57:38 +00:00
Automerger Merge Worker
f227708d08 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce
Change-Id: I3fdabb38a0056f1b596ba4e1924e2116ba600f74
2020-02-07 02:55:05 +00:00