PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,823 Commits 1 Branch 0 Tags
0f6470a062785cfe794645b9283112c290f9b5e3
Commit Graph

79823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
0f6470a062 [automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours am: 351a28418c -s ours 
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfccf58e96177c2e30d66057a284e472db2bc50
 2021-03-04 15:06:42 +00:00
SongFerngWang
351a28418c [automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours 
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87e7116e1731b417e605330d2ddf5a5f1b594862
 2021-03-04 14:48:16 +00:00
Stanley Wang
960dcfde06 Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev am: a380b04d7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61c30acb277242b0be019d0a1eee4ff4eb1caa62
 2021-03-04 14:43:56 +00:00
Stanley Wang
a380b04d7b Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev 2021-03-04 14:12:47 +00:00
SongFerngWang
959454f32a Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
 2021-03-04 13:45:18 +00:00
SongFerngWang
18c15a2545 Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0892ae8b68eff489e2274aad56588d3c918a369e
 2021-03-04 13:10:46 +00:00
Stanley Wang
522f18584c Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev am: c4d839e3df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1df123abcf56011982c9939d1c2ba3fb535f0d8
 2021-03-04 13:10:09 +00:00
Calvin Pan
a51c8b6458 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev am: 41a7293038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13656807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72fcce6681cacfa140c7b6ff45602ddd87e464b8
 2021-03-04 13:09:05 +00:00
Stanley Wang
c4d839e3df Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev 2021-03-04 11:44:38 +00:00
Calvin Pan
41a7293038 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev 2021-03-04 11:33:47 +00:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources 
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
 2021-03-04 09:41:31 +00:00
SongFerng Wang
106d9c432f [automerger skipped] Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 am: a0a079ed11 -s ours am: fea98ca447 -s ours 
am skip reason: Change-Id I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a with SHA-1 e18207b951 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6da174f7045cae289cbb6e46c5380964064e4a08
 2021-03-04 09:18:25 +00:00
changbetty
65ee03788d [automerger skipped] [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 am: d64a350d86 am: 44812e5f61 -s ours am: 3729a80710 -s ours 
am skip reason: Change-Id I110727b643a6755ee888708bd1fb2a39cf524a2d with SHA-1 c707b90d0a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ca8641abd2f78deb6654770e6ec15ca2062344
 2021-03-04 09:18:24 +00:00
changbetty
21893a2ce9 [automerger skipped] [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf am: fec00ac4b7 am: f0ea678e15 -s ours am: 5630737c58 -s ours 
am skip reason: Change-Id I1778832b0602062adb24928343c0c1d0e525942d with SHA-1 fc29bdedc7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56fce8087eeff42083eabe5012e71534609f19fb
 2021-03-04 09:18:22 +00:00
SongFerng Wang
fea98ca447 [automerger skipped] Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 am: a0a079ed11 -s ours 
am skip reason: Change-Id I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a with SHA-1 e18207b951 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86a1cd6731be7b0687cd5b0c1ce572c78e90a442
 2021-03-04 08:24:02 +00:00
changbetty
3729a80710 [automerger skipped] [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 am: d64a350d86 am: 44812e5f61 -s ours 
am skip reason: Change-Id I110727b643a6755ee888708bd1fb2a39cf524a2d with SHA-1 c707b90d0a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf559468c6fb440e55146aa063712bdcb22880b
 2021-03-04 08:24:00 +00:00
changbetty
5630737c58 [automerger skipped] [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf am: fec00ac4b7 am: f0ea678e15 -s ours 
am skip reason: Change-Id I1778832b0602062adb24928343c0c1d0e525942d with SHA-1 fc29bdedc7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0171105870be5c18de6f38578158c21c6ef80883
 2021-03-04 08:23:57 +00:00
Stanley Wang
b69896ae60 Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" 
notification will pop up.

The root cause of the problem is that the switch preference and
switch bar status are not sync when using setCheckedInternal API.

Fix: 179498532
Test: Run robotest and see the ui
Change-Id: Ib51dc2ef27ce49b9c8ba69eb32757bf6b9945baf
 2021-03-04 15:50:47 +08:00
SongFerng Wang
a0a079ed11 Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68dd01db1ee41b4baf09338872edc8599d892f96
 2021-03-04 07:41:45 +00:00
changbetty
44812e5f61 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 am: d64a350d86 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7cde36e5bc7ca5b0899915eaaaf04c0dd974f22
 2021-03-04 07:41:43 +00:00
changbetty
f0ea678e15 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf am: fec00ac4b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I280b6ed2f09e4c040c4563582cee05c3a03c66bc
 2021-03-04 07:41:09 +00:00
Stanley Wang
3b70c6c41a Fix the overlap issue of MainSwitch and list view. 
This issue happen on Developer and Wi-Fi pages, so the problem
should be solved on SettingsActivity.

Fix: 181341927
Test: Run robotest and see the ui
Change-Id: I57722cfcbeb6390c88101d808429346045e57c92
 2021-03-04 15:08:18 +08:00
SongFerng Wang
fa58b7e292 Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id800c96a0c41593b68d1718e0eb3b11eaf05538e
 2021-03-04 06:48:24 +00:00
changbetty
d64a350d86 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id43b7eb15d35bc2c3730b3118d399c8d4f66424f
 2021-03-04 06:48:18 +00:00
changbetty
fec00ac4b7 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d5ff0ee3f8af2de5387d61094be0d9f3c35ce6b
 2021-03-04 06:48:02 +00:00
Janis Danisevskis
20bb7cc44c [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp am: f33b7dd3cc -s ours am: 54e4a3097a -s ours 
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26c2455a9b9897f76ce79e2b56de07cbe82cfd77
 2021-03-04 06:29:34 +00:00
SongFerng Wang
cbc2c4f102 Merge changes I89162011,I110727b6,I1778832b 
* changes:
  Settings JUnit test for PreferredNetworkModeContentObserverTest
  [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
  [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
 2021-03-04 06:17:31 +00:00
Janis Danisevskis
54e4a3097a [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp am: f33b7dd3cc -s ours 
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3683521b0a0ad208e33315f62fc423452543f741
 2021-03-04 06:15:09 +00:00
Janis Danisevskis
697e2c5875 [automerger skipped] Merge changes from topic "presubmit-am-03a3a875d0c94ff6acffde163153233a" into sc-dev am: 7e7af0ffee -s ours 
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 93af3137fc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8050ef891b470db0f7d61d4721d02fbd2dab12d0
 2021-03-04 06:11:41 +00:00
Janis Danisevskis
f33b7dd3cc Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp 2021-03-04 05:33:21 +00:00
Janis Danisevskis
7e7af0ffee Merge changes from topic "presubmit-am-03a3a875d0c94ff6acffde163153233a" into sc-dev 
* changes:
  [automerged blank] Keystore 2.0: Update Wifi settings to use mostly public keystore API. 2p: 2c74864579
  Keystore 2.0: Update Wifi settings to use mostly public keystore API.
 2021-03-04 05:33:21 +00:00
Xin Li
fa347adb45 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours am: 69d7e7f3c4 -s ours am: 6d513a2c67 -s ours 
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0275d538b8b62680ea9ae6d7778106b4a87d697
 2021-03-04 00:36:22 +00:00
Xin Li
6d513a2c67 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours am: 69d7e7f3c4 -s ours 
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49409ce7842b4187aa01fcaee23f876bc938faf4
 2021-03-04 00:12:00 +00:00
Xin Li
69d7e7f3c4 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours 
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2edcb96daa60890af923f429ebdf72de2e15eaa
 2021-03-03 23:37:01 +00:00
Sally Yuen
dd2f3ef51d Merge "Bold text string update" into sc-dev am: 9edf9597e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13756893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4464d48444ca5bc6bc958cabdd7e9640c1882644
 2021-03-03 23:30:33 +00:00
Janis Danisevskis
6b6f75b967 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev am: 1a10ffe990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715126

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I596fc2ebd493ec772e9f60d26da2e91944a303dd
 2021-03-03 22:39:17 +00:00
Sally Yuen
9edf9597e9 Merge "Bold text string update" into sc-dev 2021-03-03 22:31:17 +00:00
Janis Danisevskis
1a10ffe990 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev 2021-03-03 22:28:41 +00:00
Xin Li
60b92f8e94 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours 
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345dadeff9da4646a382bee8f083233e2c4a55c
 2021-03-03 22:28:38 +00:00
Yu-Han Yang
48896e1640 Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev am: d0267d5f8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic59f0c84b43b3d6b83e19e7abce6f7262139a308
 2021-03-03 21:42:31 +00:00
Xin Li
6b94f5ac81 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:36 +00:00
Yu-Han Yang
d0267d5f8d Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev 2021-03-03 20:45:29 +00:00
sallyyuen
f7c6390bd2 Bold text string update 
Test: manual
Bug: 181789336
Change-Id: I75a622005f7df58ea7ec7954d602b0e2f208619e
 2021-03-03 20:16:12 +00:00
Almaz Mingaleev
a0c197346d Update GeoTZ strings. am: 18ae34ec90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6dec7b2928b38120b369bdc86c5a69a49bb87dfd
 2021-03-03 19:04:44 +00:00
Almaz Mingaleev
18ae34ec90 Update GeoTZ strings. 
Change button title to "Use location to set time zone" and
summary text to "Automatic time zone is off" when
"Set time zone automatically" is off.

Bug: 152746236
Test: checked UI manually
Merged-In: Iab177297e9047ff3b6e9452876061cdaa0740ef1
Change-Id: Iab177297e9047ff3b6e9452876061cdaa0740ef1
(cherry picked from commit fa79ee6727)
 2021-03-03 17:20:37 +00:00
Xin Li
2aa4fea82d Merge RQ2A.210305.007 
Bug: 180401296
Merged-In: I12e20519ac29f802f9983dcf27f313388b33829c
Change-Id: I8ca0bb7173f6abe08596422b281f6913b66ab9b7
 2021-03-03 09:12:21 -08:00
Adrian Roos
50e7cc6c83 Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e" am: d99faa25c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1765327c3392e570e65c8025c6399b38c0441e04
 2021-03-03 15:41:17 +00:00
Jeremy Goldman
3611c3e22f Settings JUnit test for PreferredNetworkModeContentObserverTest 
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
Merged-In: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
 2021-03-03 23:39:07 +08:00
changbetty
fbb61ba4d0 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. To get the original value and add @After to restore the data

Bug:
Test: atest -c CdmaListPreferenceTest
      atest -c CdmaSubscriptionPreferenceControllerTest
      atest -c CdmaSystemSelectPreferenceControllerTest
Change-Id: I110727b643a6755ee888708bd1fb2a39cf524a2d
Merged-In: I110727b643a6755ee888708bd1fb2a39cf524a2d
 2021-03-03 23:35:43 +08:00
changbetty
2e763e52cf [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
Merged-In: I1778832b0602062adb24928343c0c1d0e525942d
 2021-03-03 23:33:00 +08:00