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

76380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c068c82e34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 700b219fb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I860ecb7701da5038b1249c09c3a0e9bf0a41344e
 2020-09-09 23:01:16 +00:00
TreeHugger Robot
4fe663be55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 29068a8310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16dfb02843bbfa242e33573bcbf66baf8efe01a4
 2020-09-09 23:00:30 +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
Bill Yi
e0e81b9e9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours am: 64fd27fd35 -s ours am: 32589a674e -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: Ie2579389d50eaef12b2b40ec2d4807daa658ad38
 2020-09-09 22:02:57 +00:00
Bill Yi
aeab09fbda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -s ours am: 51726dfb9b -s ours am: 733707023e -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: Ib2bf7645778a8b24905ec07583e4de825447263c
 2020-09-09 22:02:49 +00:00
Bill Yi
ec3f40adc2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -s ours am: ec05886ffb -s ours am: 807c4ed6e8 -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: Id86f70ade8e9749022dea4f848e2d4704cbd08ff
 2020-09-09 22:02:05 +00: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
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
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
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