PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,361 Commits 1 Branch 0 Tags
336831c459dc5ec22a7e6a3d9c6947ec16848f15
Commit Graph

76361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
336831c459 Merge "Resolve tiles intent before prompting a dialog for profile selection" am: 7b8b881f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401652

Change-Id: I06a28acdb2f757d6fee843f43c8a9c6bbff458e3
 2020-09-09 15:04:17 +00:00
Yanting Yang
7b8b881f8a Merge "Resolve tiles intent before prompting a dialog for profile selection" 2020-09-09 14:44:35 +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
1bf4a12e9d Merge "Add the gray color into the palette for color correction." am: 0f61d2aa31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533605

Change-Id: I76da6fe8fbaee7bba5a3a41dd0e7b4c243e050ce
 2020-09-09 09:52:23 +00:00
PETER LIANG
0f61d2aa31 Merge "Add the gray color into the palette for color correction." 2020-09-09 09:09:35 +00:00
timhypeng
7444faf9ad Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: c3bd801a89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12517258

Change-Id: Ibf623ce7bb2253be8115fd9a23bf44108ca36efa
 2020-09-08 07:33:26 +00:00
Jason Chiu
aa6cccecdb Merge "Fix the endless panel loading" am: 630b23b3de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12323701

Change-Id: I719225754a681af8a2510a1a5092a85e62b1a775
 2020-09-08 06:34:30 +00: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
4ed8daf93c Merge "[Testing] Use AndroidJUnit4 instead in DataServiceSetupPreferenceControllerTest" am: 4badae1a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12500964

Change-Id: I33e6dc619951afca5d4d7902aa7d21c7073db89b
 2020-09-08 01:55:41 +00:00
Betty Chang
836e205d0d Merge "[Testing] Use AndroidJUnit4 instead in DisableSimFooterPreferenceControllerTest" am: b05056bce7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12500963

Change-Id: Ifc38a4f0dc4f59c36068a427462d216d789b500a
 2020-09-08 01:55:34 +00:00
Betty Chang
74a1a9742a Merge "[Testing] Use AndroidJUnit4 instead in PreferredNetworkModePreferenceControllerTest test files" am: 9928db2e7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493715

Change-Id: I86ab915464c5a29944dca45c77d24f27b99723af
 2020-09-08 01:55:27 +00:00
Betty Chang
4103332152 Merge "[Testing] Use AndroidJUnit4 instead in telephony/gsm/ test files" am: 13aa43c2f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493705

Change-Id: I107bc20137a3e6d05f2ef93c7ab5bda81f1b26ad
 2020-09-08 01:55:13 +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
1cf86d1f76 Merge "[Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest" am: 645da1dac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523485

Change-Id: I4f703d6cf6f72d67e48b9301583df3cf1ce776e2
 2020-09-07 10:23:09 +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
6518d34c77 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: fd1f4cba36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355979

Change-Id: If682d52519e37c73801cf8d1a4b31ec2f5bc99ae
 2020-09-07 00:51:28 +00:00
Betty Chang
fd1f4cba36 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-07 00:35:18 +00:00
Bill Yi
f1bf74c6d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: de28bc7c7e -s ours am: 089ac7f7d2 -s ours am: 4050ae795b -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: I3d73a9a02c5f988e65074fa376ba574dd7279a48
 2020-09-06 20:40:09 +00:00
Bill Yi
e4baec30c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a -s ours am: 6746ecb1c4 -s ours am: 325cf53ebd -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: Ia5d899072e682542198de91fe42322ec7bdb0efd
 2020-09-06 20:40:04 +00:00
Bill Yi
15d9d5d6a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: 3f9c81573d -s ours am: 13281b0aeb -s ours am: 3fde685eb3 -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: Ifab40cba5029e0152cda7fddb1e97978382f8ec2
 2020-09-06 20:39:58 +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
TreeHugger Robot
279c2e3c21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c4f4c332 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33fb275d67399f77e3e825ff9435f754cc197a35
 2020-09-06 19:53:07 +00:00
Bill Yi
a07d2bb77a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c0b923be9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I338d7923f7ce5704f588e50e5872c0d3cf88bb17
 2020-09-06 19:52:57 +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
fb47a8e4db [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: bcb6d4f444 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66c7a7a33149c119a6d9e824d35a31d738fbbe60
 2020-09-05 20:18:12 +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
Treehugger Robot
8b2080e7cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
 2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
 2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
 2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 18:32:54 +00:00
Treehugger Robot
81d6469601 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours am: 3867542239 -s ours am: f85d3b3f5f -s ours am: 42c86c42f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib939f9ca94867eaafaacc127a4f0f5aab36241cc
 2020-09-05 15:59:56 +00:00