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
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
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
19a7ddd02b
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"
2020-08-18 10:27:32 +00:00
changbetty
fc29bdedc7
[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right
4. Create the real object for PhoneAccountHandle and ComponentName
Bug: 164989754
Test: atest -c MobileNetworkUtilsTest
Change-Id: I1778832b0602062adb24928343c0c1d0e525942d
2020-08-18 16:18:56 +08:00
hoffc
291fd9b816
Settings: Fix exception in about phone during SIM swap
...
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.
Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.
Bug: 159410236
Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
2020-08-18 13:57:55 +08: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
changbetty
933e4df3c9
[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
Bug: 164986221
Test: atest -c TelephonyBasePreferenceControllerTest
Change-Id: Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8
2020-08-17 12:41:20 +00:00
Betty Chang
1adaa8ba27
Merge "[Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest"
2020-08-17 10:46:30 +00:00
jasonwshsu
62dc1b6364
Fix checkbox in magnification mode dialog does not have ripple effect
...
* Move onClickListener to LinearLayout since checkbox has null background in xml
* Rewrite setTextAreasClickListener logic to fit the need: at least one
checkbox need to be checked, and to let talkback announce disabled when
view is really in disabled state.
Bug: 164343865
Test: manual test
Change-Id: Ia5a831febc41f01858908cbdc365cf9a6a1282e3
2020-08-17 17:27:49 +08: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
202494365c
Update settings together with frameworks/base
...
LockSettingsService returns a handle to the gatekeeper password
instead of the password itself now. As such, update areas of code
accordingly.
Bug: 161765592
Test: RunSettingsRoboTests
Run the following on face/fingerprint devices
Test: Remove credential
adb shell am start -a android.app.action.SET_NEW_PASSWORD
Set up credential + fingerprint
Test: Remove credential,
adb shell am start -a android.settings.FINGERPRINT_SETTINGS
This tests the ChooseLock* logic in FingerprintSettings
Test: Set up credential,
adb shell am start -a android.settings.FINGERPRINT_SETTINGS
This tests the ConfirmLock* logic in FingerprintSettings
Test: Remove device credential, enroll fingerprint/face. Succeeds.
This tests the ChooseLock* returning SP path from
BiometricEnrollIntro
Test: With credential and fingerprint/face enrolled, go to
fingerprint/face settings and enroll. This tests the
ConfirmLock* path in Fingerprint/FaceSettings
Test: Remove device credential, enroll credential-only, enroll
fingerprint/face separately. Succeeds. This tests the
ConfirmLock* returning SP path in BiometricEnrollIntro
Test: In SUW, set up credential, then biometric. This tests
the ChooseLock* path in SUW
Test: In SUW, set up credential, go back, then set up biometric.
This tests the ConfirmLock* path in SUW
Change-Id: Ibc71ec88f8192620d041bfd125f400371708b296
2020-08-16 12:38:27 -07: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
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
297fc4b9f9
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I2b7e845d99bd0e46d124d1d9508ca5aaded8002e
2020-08-15 02:33:33 +00:00
Yi-Ling Chuang
41e4d66dfd
[automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: c248da2974
am: f9b6dd0fe7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I7af9b8050d0081fc823d4c80568181735f75f4aa
2020-08-15 02:33:31 +00:00
Automerger Merge Worker
a881106238
Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp am: fa9cc7830a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I14200b1599a4fb6a7f5d94c21f90506d9403e12f
2020-08-15 02:33:19 +00:00
Yi-Ling Chuang
2a0b09893f
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I390cd9424e39426f7022968f716e1d37e5f80f49
2020-08-15 02:33:17 +00:00
Yi-Ling Chuang
d07f4e59ec
[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: ec05383478
am: 50349a9543
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ibed04dfad384828c997efc54b5d247f296d834ce
2020-08-15 02:32:56 +00:00
Jason Chiu
70c298e9cd
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
am: 1dfb8c8644
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ie675ec09705d7a010ab6abb114f40c037efac10e
2020-08-15 02:32:54 +00:00
Yi-Ling Chuang
24328feca3
[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
am: 68e80545b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I2f7c4737d930fea7a800b79ce10b65c8c477be61
2020-08-15 02:32:41 +00:00
Jason Chiu
ac76b763fa
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
am: 0f87cd00a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ie37a13a666fae4f956ab447204fd06edc6146538
2020-08-15 02:32:39 +00:00
Yi-Ling Chuang
ecf25c02f0
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: f046aa5beb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Iff0e8b936c7268c8622e8a7079a27d8a0e5be4dd
2020-08-15 02:20:48 +00:00
Yi-Ling Chuang
f9b6dd0fe7
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: c248da2974
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I6988e9ab91ae2cf15e95702c438d4c0529317095
2020-08-15 02:20:46 +00:00
Automerger Merge Worker
fa9cc7830a
Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
2020-08-15 02:20:40 +00:00
Yi-Ling Chuang
09b5db829e
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Ie5cea9ddee70dfbe48de0ce995ee6f4a1bcf36bc
2020-08-15 02:20:35 +00:00
Yi-Ling Chuang
50349a9543
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: ec05383478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I45f3140b7b3beba80536ca9779c33479a29b6a7d
2020-08-15 02:20:34 +00:00
Yi-Ling Chuang
e50265cb43
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I72029cb7956edadd3faef36de6b0e81176575985
2020-08-15 02:20:32 +00:00
Jason Chiu
1dfb8c8644
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I206e049ba2e6e3652b6a316d269d6cf37af4c0b3
2020-08-15 02:20:30 +00:00
Yi-Ling Chuang
68e80545b0
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Id6b9042fe823441588be96689692fe47fbbde049
2020-08-15 02:20:15 +00:00
Jason Chiu
0f87cd00a1
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ib6bcff33b0dc7af2935e937f600cb6832f48febf
2020-08-15 02:20:13 +00:00
Yi-Ling Chuang
f046aa5beb
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I4db8cc713daaa14566b1f44dea0aab1aa01c8ce5
2020-08-15 02:08:58 +00:00
Yi-Ling Chuang
c248da2974
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I76c77c66be5da635571f876d9b76906f789e8472
2020-08-15 02:08:57 +00:00