PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,997 Commits 1 Branch 0 Tags
24f36e71f64f2f200229f81a9d104cd815d318a7
Commit Graph

75997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
24f36e71f6 Merge "Add Panic button sound preference to panic gesture settings page." am: e9c717b6c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12390081

Change-Id: Ic8d86cc46378209d2af49a2ec00d8f114efe1123
 2020-08-19 02:50:34 +00:00
TreeHugger Robot
e9c717b6c6 Merge "Add Panic button sound preference to panic gesture settings page." 2020-08-19 02:01:06 +00:00
Automerger Merge Worker
f7c1c40604 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 5b84d06935 -s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c -s ours am: 6d9bafb14f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I709e4bcf533ebf3402e7610184fb14b9afbba10c
 2020-08-19 00:24:06 +00:00
Bill Yi
700bd87961 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 71f92d16f6 -s ours am: 9f83e2311d -s ours am: 8bfcb46566 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: If0659a311bc07ef30b8cf9cea6b8f46290032231
 2020-08-19 00:24:00 +00:00
Automerger Merge Worker
6d9bafb14f Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 5b84d06935 -s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I82c02e437baceaab084d5b13ac97849d7d5e8a7e
 2020-08-19 00:14:37 +00:00
Bill Yi
8bfcb46566 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 71f92d16f6 -s ours am: 9f83e2311d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I1d328e23336137f4c6bf55fd18fd1103da690f9f
 2020-08-19 00:14:24 +00:00
Automerger Merge Worker
dba49a339c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 5b84d06935 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-19 00:06:46 +00:00
Bill Yi
ee0336cfdd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 5b84d06935 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: Ic4f58799fb98474e3a821a2ad1738dc23a030d97
 2020-08-19 00:06:42 +00:00
Bill Yi
9f83e2311d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 71f92d16f6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I4e0bb025276fb7c296befad128ec4b7855300892
 2020-08-19 00:06:38 +00:00
Bill Yi
71f92d16f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I7a85b209939df65602839039ba06c04ca20f3071
 2020-08-18 23:55:57 +00:00
Bill Yi
5b84d06935 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I0de30d4aafd65ab184661b0b58979cedc5367f4a
 2020-08-18 23:55:49 +00:00
Bill Yi
dba8d2eeb4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad6c46f99fb4b3c48b6580c03a6e482655714213
 2020-08-18 15:50:45 -07:00
Julia Reynolds
33a6256e9a Merge "Don't put a null in a spannablestringbuilder" am: a09121353d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392874

Change-Id: I454df94af9e821de01815b408b4417c0d5e7e57f
 2020-08-18 19:02:17 +00:00
Julia Reynolds
a09121353d Merge "Don't put a null in a spannablestringbuilder" 2020-08-18 18:48:28 +00:00
Fan Zhang
67d3454265 Add Panic button sound preference to panic gesture settings page. 
Also renamed emergency_sos_* to panic_*. "emergency sos" is used by
other OEMs.

https://screenshot.googleplex.com/66097f3e-6aa0-4e2f-afb8-22f278bb0ed7.png

Bug: 161394591
Test: robotests
Change-Id: I14a59399fe7192d305d89a86dc93380c1e4c8a1c
 2020-08-18 09:19:33 -07:00
Beth Thibodeau
eaa7e92f06 [automerger skipped] Allow user to block individual apps from resuming. am: 48ce5892e8 am: ee7da79fbf -s ours am: 860397d815 -s ours 
am skip reason: Change-Id Id3de52419ffba233469396dd47439428201e5e00 with SHA-1 f01cce88fc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268

Change-Id: Iadf7926de6d55089a5128a67e0f091f7be7cb9aa
 2020-08-18 15:08:05 +00:00
Beth Thibodeau
860397d815 [automerger skipped] Allow user to block individual apps from resuming. am: 48ce5892e8 am: ee7da79fbf -s ours 
am skip reason: Change-Id Id3de52419ffba233469396dd47439428201e5e00 with SHA-1 f01cce88fc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268

Change-Id: Icae457d3477181f13c751e5d904bb9b05c7638c5
 2020-08-18 14:49:37 +00:00
Beth Thibodeau
ee7da79fbf Allow user to block individual apps from resuming. am: 48ce5892e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268

Change-Id: I131ff7c33871d858a63824fc17ba168ba590f6e2
 2020-08-18 14:39:26 +00:00
Betty Chang
fb59ae4000 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 19a7ddd02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355980

Change-Id: I6782b9e12e174b8ead3a9d52ba7f38dcaa352489
 2020-08-18 10:41:21 +00:00
Betty Chang
19a7ddd02b Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" 2020-08-18 10:27:32 +00:00
TreeHugger Robot
892578d40c Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2 am: ef7b3433a9 am: d453134ac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: Ib152ad0fd7a2259958ceff99ccdd8ff991848f90
 2020-08-17 23:52:55 +00:00
Betty Chang
b8a4a10bcc Merge "[Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest" am: 1adaa8ba27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343223

Change-Id: I7ae709b9aa7924f8e046350a2d2f6916f277b16a
 2020-08-17 23:48:15 +00:00
Kevin Chyn
2f1d380810 Update biometric onChallengeGenerated with frameworks/base am: 9ce9d3d539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12280210

Change-Id: I274a004b7516bb961745a4e2b6b395638d2a657e
 2020-08-17 23:29:43 +00:00
TreeHugger Robot
d453134ac1 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2 am: ef7b3433a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: I1ae5cd31a99659d6240c756cc88601185c40b25b
 2020-08-17 20:40:17 +00:00
TreeHugger Robot
ef7b3433a9 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: Ib289fc74a560a02b2d925c8b941c8cc7a04f5d7f
 2020-08-17 20:38:28 +00:00
TreeHugger Robot
e87f0d9fa2 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: I13794e6cf89c14ea1ebd5a2751e4590f4b7f4c01
 2020-08-17 20:25:53 +00:00
TreeHugger Robot
60e33309b2 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp 2020-08-17 20:11:11 +00:00
Julia Reynolds
7afb1d7a2b Don't put a null in a spannablestringbuilder 
Test: manual
Fixes: 162869220
Change-Id: Iad00ab417edf2dd5d1b83194c6ade2899fd1350c
 2020-08-17 12:10:44 -04:00
Beth Thibodeau
48ce5892e8 Allow user to block individual apps from resuming. 
This adds a new section to the media controls settings screen with a
list of apps that could potentially be used for resumption. If an app is
toggled off it will be added to a list of apps which will not persist in
QS, even when resumption is on.

Also updated the strings on this setting page to match UX
recommendation, so the default toggle state is now on.

Bug: 161813143
Bug: 159852516
Test: manual
Test: atest SettingsProviderTests
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="ResumableMedia"
Change-Id: Id3de52419ffba233469396dd47439428201e5e00
Merged-In: Id3de52419ffba233469396dd47439428201e5e00
 2020-08-17 15:47:04 +00:00
changbetty
d2e9e42f32 [Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right

Bug: 164986958
Test: atest -c TelephonyTogglePreferenceControllerTest
Change-Id: I3d6c39f45cb1efb1742148f20f03372214eb0cbe
 2020-08-17 12:41:53 +00:00
Betty Chang
1adaa8ba27 Merge "[Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest" 2020-08-17 10:46:30 +00:00
changbetty
57abc1f865 [Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Add spy context and get the SubscriptionManager and TelephonyManager
from the spy context

Bug: 163298785
Test: atest -c SubscriptionUtilTest
Change-Id: Iefcf29904c9c4475221c20318526ce48cb88a45a
 2020-08-17 11:57:22 +08:00
Kevin Chyn
9ce9d3d539 Update biometric onChallengeGenerated with frameworks/base 
Bug: 145978626
Test: Builds

Change-Id: If02497fa6462f1ff263aeb96cf0beed014fee328
 2020-08-16 11:48:13 -07:00
Jiashen Wang
4c92dc2ba4 Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a am: e03d5ad5fb am: 9af90d3cf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I072c61b19a0271c759e88056168fbcda88f48c4d
 2020-08-15 16:36:15 +00:00
Jiashen Wang
1365c2aade [automerger skipped] Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df am: 8e939b0dfc -s ours am: f25fdedb1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I593a3247278fccd932de1d0a921e2fa1f91c4883
 2020-08-15 16:36:03 +00:00
Jiashen Wang
9af90d3cf4 Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a am: e03d5ad5fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Ia494e588b5cdcf00b93f195e9e6ff2d31733e551
 2020-08-15 16:23:16 +00:00
Jiashen Wang
f25fdedb1e [automerger skipped] Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df am: 8e939b0dfc -s ours 
am skip reason: skipped by user jiashenwang

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I2ec270b1011ece8ce1e0f2690555c2339a45d091
 2020-08-15 16:23:00 +00:00
Jiashen Wang
e03d5ad5fb Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Ia300e8e5e31b868cfaeee342524832b6ebddddc8
 2020-08-15 13:03:45 +00:00
Jiashen Wang
8e939b0dfc Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I549082280f8b9a49f75333f9327b92ea679caa61
 2020-08-15 13:03:32 +00:00
Jiashen Wang
4d00b8b57a Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I987fd968ff755e88942bd69409b59996a08c972a
 2020-08-15 12:53:07 +00:00
Jiashen Wang
e50cda81df Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Id36dbea5606b1775c83b3d6a53880a5f60ab715b
 2020-08-15 12:52:55 +00:00
Jiashen Wang
bbcd54dd63 Adding dialogs to warn users about the potential eSIM erase failure 
eUICC card could potential in the card error state and all the eSIM
operations will fail which could be fixed by a reboot. Thus, we need to
pop up a dialog to inform users that their eSIM profiles cannot be
erased successfully.

Bug: 163078560
Test: Manually tested by mocking the eUICC card error state.
Mock: https://docs.google.com/presentation/d/1AVNXxPbieTX1KmoewG4mo3xWPnEZyba_h9rPcwHHcr8/edit#slide=id.p

Change-Id: I102fb2de889e08554f525f2cbe1528bb9a37afd7
 2020-08-15 05:31:49 +00:00
Yi-Ling Chuang
7f8c8cea2d [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: f046aa5beb am: ecf25c02f0 -s ours am: 297fc4b9f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I050a8ec41f88ae4f3621004558515202240b2a26
 2020-08-15 02:53:16 +00:00
Yi-Ling Chuang
c5dbf03b08 [automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: c248da2974 am: f9b6dd0fe7 -s ours am: 41e4d66dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I0e8119af2ecb85d6213d0b0fae320da1d9c1254f
 2020-08-15 02:53:12 +00:00
Automerger Merge Worker
c6a3412701 Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp am: fa9cc7830a am: a881106238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Ia9bd76d00938b615c7baf36d9faf2f84edaa9ee7
 2020-08-15 02:52:59 +00:00
Yi-Ling Chuang
4ba9899087 [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: 4d6f8bf34d am: 09b5db829e -s ours am: 2a0b09893f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I9f0285dc246a9bdd79c20f7670c77067b8d086d2
 2020-08-15 02:52:55 +00:00
Yi-Ling Chuang
62c770b16d [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: ec05383478 am: 50349a9543 -s ours am: d07f4e59ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I660d70b6ccd7c1aefc620592014eac2dec6e8159
 2020-08-15 02:52:36 +00:00
Jason Chiu
4af087883d [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 4113bf12d0 am: 1dfb8c8644 -s ours am: 70c298e9cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I2997c4c1ca545bd9acad7a552f384551f3d50eac
 2020-08-15 02:52:33 +00:00
Yi-Ling Chuang
33d20782ac [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: f07366ff12 am: 68e80545b0 -s ours am: 24328feca3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ifffdba024c587936dea7001688ec4b19738d4e93
 2020-08-15 02:52:16 +00:00
Jason Chiu
9d0abd684f [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 68173c1343 am: 0f87cd00a1 -s ours am: ac76b763fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I7afeb0ef7eea928cf14a56ee714e121c970bfbdc
 2020-08-15 02:52:12 +00:00