Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,567 Commits 1 Branch 0 Tags
aa461b0910335fe3ef625360fe2ecbbcd3ff09a8
Commit Graph

58567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
4f4c05addb Merge "Update profile api" 2020-02-07 02:46:12 +00:00
Bonian Chen
c2823ab2ce Merge "[Settings] fix failure test case - ConditionContextualCardController" 2020-02-07 02:40:17 +00:00
tim peng
5610db5a2b Merge "Add title and icon in output switcher panel header" 2020-02-07 01:49:11 +00:00
Raff Tsai
1aa958f588 Merge "Sync lastest SettingsLib interface" 2020-02-07 00:53:12 +00:00
David Su
2ad3a3e0ab Merge "Migrate to getNetworkSelectionStatus()" 2020-02-06 18:15:44 +00:00
Automerger Merge Worker
0c277e444a [automerger skipped] Merge "Refactored cell broadcast area info support" am: c36cc4e120 am: 62480277ed am: 403ab5da4d -s ours 
am skip reason: Change-Id If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe with SHA-1 c4da22a2ce is in history

Change-Id: Id0c02420887f2d9a9420444064a2434162f8028e
 2020-02-06 17:49:24 +00:00
Automerger Merge Worker
403ab5da4d Merge "Refactored cell broadcast area info support" am: c36cc4e120 am: 62480277ed 
Change-Id: Ibb2f1dd5e007a78ab77dab21f086749df3a5a9cf
 2020-02-06 17:40:08 +00:00
Automerger Merge Worker
62480277ed Merge "Refactored cell broadcast area info support" am: c36cc4e120 
Change-Id: Ib1648fc64bc12d11b889468cd6a6c5c4ff09f0c2
 2020-02-06 17:26:15 +00:00
Jack Yu
c36cc4e120 Merge "Refactored cell broadcast area info support" 2020-02-06 17:17:49 +00:00
TreeHugger Robot
53d56a0e31 Merge "Add content descripiton to shortcut setting for meaningful labels." 2020-02-06 16:13:14 +00:00
menghanli
15cb5c1937 Add content descripiton to shortcut setting for meaningful labels. 
Bug: 148965509
Test: Manual test
Change-Id: I771fa782f9acf76a60a0da9216f9b691b25583ca
 2020-02-06 19:10:07 +08:00
TreeHugger Robot
e903a24be5 Merge "Remove the announcement of accessibility event for PaletteListView." 2020-02-06 10:43:40 +00:00
SongFerng Wang
0533b1b307 Merge "Bug:PreferredNetworkModePreferenceController.java not being refreshed" 2020-02-06 10:43:33 +00:00
TreeHugger Robot
abec4def72 Merge "Show underline when text show a link" 2020-02-06 10:37:30 +00:00
TreeHugger Robot
ab06fc2454 Merge "Leverage the code from qt-qpr1-dev to master" 2020-02-06 10:29:39 +00:00
Peter_Liang
a7a0e08241 Remove the announcement of accessibility event for PaletteListView. 
Root cause: The color block of color correction have no any content
desciption and it also can't be tapped to trigger others behavior.
Goal: Remove accessibility event

Bug: 148957372
Test: manual test
Change-Id: I97425e24a54e983a49189389746540ed98af82f9
 2020-02-06 17:24:30 +08:00
Sunny Shao
8d0d90096c Leverage the code from qt-qpr1-dev to master 
Fixes: 147124412
Test: manual test

Change-Id: I6e937c6d34b635ecfdd2e29b22d0023f23f695e3
 2020-02-06 17:20:58 +08:00
robertluo
ccc60d706c Modify Secure NFC function naming 
Fixes: 148990198
Test: manual and check if new string is applied
Screenshot: https://screenshot.googleplex.com/TU6OpMdbJtW.png
Change-Id: Ia32e087e64069eee8ce871f63a9dfbc9bb527801
 2020-02-06 09:12:49 +00:00
Tsung-Mao Fang
4620cddba4 Merge "Use system-api lib to get badged, shadowed icons" 2020-02-06 09:01:21 +00:00
SongFerngWang
7164275393 Bug:PreferredNetworkModePreferenceController.java not being refreshed 
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)

Change-Id: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
 2020-02-06 17:00:58 +08:00
Tsung-Mao Fang
605218c57b Show underline when text show a link 
Hyperlinked text should have underline instead of using color only,
such that color blind users are able to compare to the surrounding text.

Change-Id: I7e93f76ebd40077710385e8670176e878b021ef8
Fix: 148839397
Test: visual see link in "Skip songs", "Silence interruptions", "Reach to check phone".
 2020-02-06 16:36:59 +08:00
Tsung-Mao Fang
323347afcc Use system-api lib to get badged, shadowed icons 
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
Change-Id: Ie148890fbbbf71f42863a8fe727a90615158b8c1
Fix: 33646131
 2020-02-06 15:02:56 +08:00
TreeHugger Robot
07d9557b29 Merge "Make tether preference controllers extend BasePreferenceController" 2020-02-06 06:56:21 +00:00
Bonian Chen
fdd3a1fce9 Merge "[Settings] Fix Java Doc" 2020-02-06 06:51:18 +00:00
Automerger Merge Worker
3965675afe [automerger skipped] Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb am: 23fab9be21 am: 139c108a03 -s ours 
am skip reason: Change-Id I8b948d1d416e1eb79e34be073b8ad81645d5ebb1 with SHA-1 73038f556d is in history

Change-Id: I621b637776584d1c51e9794d7b3d8a44d887c2b2
 2020-02-06 06:43:00 +00:00
Automerger Merge Worker
139c108a03 Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb am: 23fab9be21 
Change-Id: I7fa1fa40e29f0eccdc05fff69ef4b0c17da3b3e1
 2020-02-06 06:33:53 +00:00
Automerger Merge Worker
23fab9be21 Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb 
Change-Id: I42233960cd715d506fc899f845ba7818a56e6886
 2020-02-06 06:19:24 +00:00
Automerger Merge Worker
43190bf92b [automerger skipped] Add whitelist in ResetAppsHelper am: 74ded43527 am: 07f9393486 -s ours 
am skip reason: Change-Id Ie2f527309f9159babe79636a69ff13fe3ceb64d9 with SHA-1 b54d2f90f2 is in history

Change-Id: I80ec62b13bc64387e3dcbc858631b357730dcccd
 2020-02-06 06:14:15 +00:00
Zoey Chen
814b7c40cb Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" 2020-02-06 06:11:50 +00:00
Automerger Merge Worker
07f9393486 Add whitelist in ResetAppsHelper am: 74ded43527 
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
 2020-02-06 06:03:18 +00:00
TreeHugger Robot
f63f55afc6 Merge "Rename some resource values for graphics driver preferences dashboard." 2020-02-06 05:17:08 +00:00
Paul Chang
21bc28cae7 Merge "Don't label non-system default handling app with sub text if there is only one profile." 2020-02-06 05:12:36 +00:00
Robert Luo
3e78df55a0 Merge "Merge Tap & Pay settings entries with NFC" 2020-02-06 05:03:39 +00:00
robertluo
81c79bb239 Merge Tap & Pay settings entries with NFC 
Bug: 142231537
Test: make -j42 RunSettingsRoboTests
Change-Id: I54ea0cdf711f2c381f5bba8575fc22bd6329f3c6
 2020-02-06 12:15:39 +08:00
hughchen
4d94a32482 Update profile api 
The profile will auto connect / disconnect when set enable / disable
profile. This CL remove connect / disconnect method.

Bug: 141582844
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib875d126be0d8483fb539e7ba950242a4f38cf81
Merged-In: Ib875d126be0d8483fb539e7ba950242a4f38cf81
 2020-02-06 11:20:09 +08:00
Peiyong Lin
d03dd5ce2a Rename some resource values for graphics driver preferences dashboard. 
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I1f63bd40d5de0cd762bf34a75c7eebd9865a13dd
 2020-02-05 18:01:59 -08:00
TreeHugger Robot
cf4e12bbd9 Merge "Update profile api" 2020-02-06 01:47:19 +00:00
TreeHugger Robot
3de4dc273c Merge "Remove oneSelectableTwoDisabledPSimsOneAbsent_twoResults" 2020-02-05 22:18:25 +00:00
Curtis Belmonte
82431abfd9 Merge "Add curtislb@ to settings/biometrics OWNERS file" 2020-02-05 21:38:55 +00:00
Malcolm Chen
dc1dd56b41 Remove oneSelectableTwoDisabledPSimsOneAbsent_twoResults 
It's not needed as logic of detecting disabled pSIM is moved to
Telephony.

Bug: 147791865
Test: sanity
Change-Id: I158243bcf59e6c39fb55421632e7013ebc80ae80
 2020-02-05 20:13:29 +00:00
Zhen Zhang
258fb7f672 Make tether preference controllers extend BasePreferenceController 
These controllers extended AbstractPreferenceController, which is not
quite compatible with some of the present framework. Especially for
indexable keys of settings search.

TetherEnabler and AllInOneTetherSettings are refactored based on the
change. Tests are updated.

Bug: 147272749
Test: CodeInspectionTest and other tests of classes touched by this CL
Change-Id: Ic3ad13e735d133c0959a0a309319a6fd5165b015
 2020-02-05 10:18:57 -08:00
Jay Aliomer
105624cf14 Merge "Custom restrictions Missing period" 2020-02-05 17:36:39 +00:00