TreeHugger Robot
b7682b98ec
Merge "Update battery saver preference key"
2020-09-10 07:02:38 +00:00
Betty Chang
e8b877e3ee
Merge "[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest"
2020-09-10 02:30:24 +00:00
Betty Chang
914fdb6b5f
Merge "[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest"
2020-09-10 02:30:09 +00:00
Kevin Chyn
3c3450e656
Merge "1/n: Clean up BiometricEnrollActivity"
2020-09-10 01:25:23 +00:00
TreeHugger Robot
700b219fb1
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-09 22:40:15 +00:00
TreeHugger Robot
29068a8310
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-09 22:29:15 +00:00
Kevin Chyn
eb8c0f14ea
1/n: Clean up BiometricEnrollActivity
...
Test: fingerprint and face enroll via
adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: credential enroll via
adb shell am start -a android.settings.BIOMETRIC_ENROLL --ei android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED 32768
Bug: 162341940
Bug: 152242790
Change-Id: Idfdf96891ba9a2394f61eedb0adde2adf9fd85e6
2020-09-09 15:07:24 -07:00
Bill Yi
32589a674e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: c59dc080ce
-s ours am: 64fd27fd35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I8c99168a70bc12ef906ce13a8a347cddbb07f050
2020-09-09 21:45:43 +00:00
Bill Yi
733707023e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: 94d3a30bcf
-s ours am: 51726dfb9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: If2f72cd6d841e69446829353ba757b6cf75255f2
2020-09-09 21:45:26 +00:00
Bill Yi
807c4ed6e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb
-s ours am: ec05886ffb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547885
Change-Id: I4b71254bab7afbf816e03c97090da2433e2a941a
2020-09-09 21:44:53 +00:00
Bill Yi
64fd27fd35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: c59dc080ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I01197f570e0cc53a724b1ee64819aab2ed954b43
2020-09-09 21:36:37 +00:00
Bill Yi
51726dfb9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: 94d3a30bcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: Icee599694366364e6625d00674516d24621dba9b
2020-09-09 21:29:42 +00:00
Bill Yi
ec05886ffb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547885
Change-Id: I8817d412d60565eaba0e7fe6d08209086f83361d
2020-09-09 21:29:28 +00:00
Bill Yi
c59dc080ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I2c1aa46ba97bfd9094471fc00a2c62fdabba6313
2020-09-09 21:09:58 +00:00
Bill Yi
94d3a30bcf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: Iddec8911b06b8da1cf5244c44e505139a48d8453
2020-09-09 21:09:57 +00:00
Bill Yi
c01738f847
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a15ffc0e8765702dc2468d075d3348ed69151c9
2020-09-09 15:52:22 +00:00
Bill Yi
7840751e7d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d7aa572632771bb3bb165d0d4d9ad9f7302d574
2020-09-09 15:12:21 +00:00
Yanting Yang
7b8b881f8a
Merge "Resolve tiles intent before prompting a dialog for profile selection"
2020-09-09 14:44:35 +00:00
Bill Yi
ae0c6a9fdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9
2020-09-09 14:34:33 +00:00
Bill Yi
28825ad9e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
2020-09-09 13:56:30 +00:00
Yanting Yang
552f340dda
Resolve tiles intent before prompting a dialog for profile selection
...
Symptom:
Once the work profile component of the tile is disabled after Settings
preloaded tiles, Settings will crash when the user clicks the work
option from the profile selection dialog.
Root cause:
Settings just checks the users from the preloaded tiles to prompt
profile selection dialog. It doesn’t check the activity for the work
profile user before launching.
Solution:
Resolve the activity by intent as users before launching if the work
profile is enabled. Directly start activity if only one user is
resolvable, otherwise prompt a dialog for profile selection.
Fixes: 162227425
Test: make RunSettingsRoboTests
Change-Id: Idcc4e5a266ab2a2252db30bb97d4be002212c677
2020-09-09 18:12:42 +08:00
PETER LIANG
0f61d2aa31
Merge "Add the gray color into the palette for color correction."
2020-09-09 09:09:35 +00:00
changbetty
0bf90f7186
[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Add @Before setup() for context
3. Change Copy Right
4. Workaround the resource getString to resolve the resource not found
Bug: 167997296
Test: atest -c MobilePlanPreferenceControllerTest
Change-Id: I5f43b6a4d20108195164038c02810b725abbcd06
2020-09-09 15:34:52 +08:00
changbetty
f24a8be2d8
[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Run the NetworkDashboardFragment on the Main thread
Bug: 168000627
Test: atest -c NetworkDashboardFragmentTest
Change-Id: I6d10737b9ac8299f2d7c847a9fdb1c3bdc4e390d
2020-09-09 11:26:42 +08:00
timhypeng
c3bd801a89
Add PairNewBluetoothReceiver to launch Bluetooth pairing page
...
-A new SystemUI dialog requires to launch Bluetooth pairing page
-Add receiver in manifest
Bug: 155822415
Test: build pass
Change-Id: I16767af3afb05eab7246be133011bc9148909d11
2020-09-08 06:24:08 +00:00
Peter_Liang
32bd252104
Add the gray color into the palette for color correction.
...
Bug: 165770905
Test: manual test & make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListPreferenceTest
Change-Id: I20cd795791b8265811a0972e04d7dcc5b4f2ce15
2020-09-08 14:06:16 +08:00
Jason Chiu
630b23b3de
Merge "Fix the endless panel loading"
2020-09-08 06:04:23 +00:00
Betty Chang
4badae1a03
Merge "[Testing] Use AndroidJUnit4 instead in DataServiceSetupPreferenceControllerTest"
2020-09-08 01:45:08 +00:00
Betty Chang
b05056bce7
Merge "[Testing] Use AndroidJUnit4 instead in DisableSimFooterPreferenceControllerTest"
2020-09-08 01:44:17 +00:00
Betty Chang
9928db2e7e
Merge "[Testing] Use AndroidJUnit4 instead in PreferredNetworkModePreferenceControllerTest test files"
2020-09-08 01:35:45 +00:00
Betty Chang
13aa43c2f8
Merge "[Testing] Use AndroidJUnit4 instead in telephony/gsm/ test files"
2020-09-08 01:33:51 +00:00
Betty Chang
645da1dac4
Merge "[Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest"
2020-09-07 09:34:56 +00:00
changbetty
bc7475a08f
[Testing] Use AndroidJUnit4 instead in telephony/gsm/ test files
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Workaround the resource getString to resolve the resource not found
Bug:
Test: atest -c AutoSelectPreferenceControllerTest
atest -c OpenNetworkSelectPagePreferenceControllerTest
Change-Id: Ic80da4fcc6a64e7fde55705dda128741c26ce3cf
2020-09-07 02:31:30 +00:00
changbetty
ca2e8c8250
[Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Remove the @Ignore tag in isAvailable_dataOnAndDsdsAnd5GSupported_Available
Bug: 167933210
Test: atest -c NrDisabledInDsdsFooterPreferenceControllerTest
Change-Id: I455a543d7a006be21523918e48cc77b403f8b56d
2020-09-07 09:27:17 +08:00
Betty Chang
fd1f4cba36
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"
2020-09-07 00:35:18 +00:00
Bill Yi
4050ae795b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: de28bc7c7e
-s ours am: 089ac7f7d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I1f1ea8cbabf3b7da8594e78b3ae2e3302839245f
2020-09-06 20:27:10 +00:00
Bill Yi
325cf53ebd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a
-s ours am: 6746ecb1c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015
Change-Id: I36a1e20fb32a5a3c54deaa1679fb85e865f0e41b
2020-09-06 20:27:05 +00:00
Bill Yi
3fde685eb3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: 3f9c81573d
-s ours am: 13281b0aeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I08752f246684e1cd98e937c527a3fe818017ffcf
2020-09-06 20:26:55 +00:00
Bill Yi
089ac7f7d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: de28bc7c7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I27f9496735033b8b7d8666ceb7a66e4abeaec921
2020-09-06 20:06:51 +00:00
Bill Yi
6746ecb1c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015
Change-Id: Iade07158a0cb1462fbe74bfa0a8875179bc5d8bf
2020-09-06 20:06:46 +00:00
Bill Yi
13281b0aeb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: 3f9c81573d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I57d32cce1ab7cb2a9acd576b1564c5dcc8c31777
2020-09-06 20:06:03 +00:00
Bill Yi
de28bc7c7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I027479bbfa400ad6bb51b1a64d8b70e0dfb68800
2020-09-06 19:52:48 +00:00
Bill Yi
3f9c81573d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
2020-09-06 19:52:05 +00:00
TreeHugger Robot
72c4f4c332
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-06 19:43:44 +00:00
Bill Yi
6c0b923be9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ide59455cd1b841a223175cc3220d695d485bc9e0
2020-09-06 14:15:37 +00:00
Bill Yi
888bee48da
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ida3e8b455f55d6ef179908c01f2758dbed42e447
2020-09-06 13:40:20 +00:00
Bill Yi
d9a2be8b1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf95416dc8ce50515dd6763c3ae24ebf89722c6a
2020-09-06 13:05:51 +00:00
Bill Yi
ee8c3875ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
2020-09-06 12:31:40 +00:00
Treehugger Robot
bcb6d4f444
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours am: 8b2080e7cc
-s ours am: 002c5b1143
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: If9d62d8e22ba63fd8254be2ea75386aa5403f7a3
2020-09-05 19:58:39 +00:00
Treehugger Robot
002c5b1143
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours am: 8b2080e7cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I69831a3612d01d0447f5a75426cce5b6f2f846a6
2020-09-05 19:43:50 +00:00