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

79595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Adrian Roos
d99faa25c0 Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e" 
This reverts commit 0df55e1eb4.

Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.

Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
 2021-03-03 14:51:42 +00:00
Paul Hu
0df55e1eb4 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
 2021-03-03 13:27:16 +00:00
TreeHugger Robot
42ac293a53 Merge "Return RESULT_OK RequestManageCredentials" into sc-dev 2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453 Merge "Refactor Usb settings" into sc-dev 2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627 Return RESULT_OK RequestManageCredentials 
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
 2021-03-03 11:30:46 +00:00
Hugh Chen
0091ae6142 Refactor Usb settings 
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.

Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
 2021-03-03 18:13:17 +08:00
TreeHugger Robot
d1718c3a15 Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev 2021-03-03 10:10:41 +00:00
Thiebaud Weksteen
c1110efc19 Merge "Add summary for 2G toggle option" into sc-dev 2021-03-03 09:23:49 +00:00
Tim Peng
d6eb5237e2 [Fix]Test cast fail at BaseBluetoothDialogPreferenceTest 
Bug: 181740451
Test: make -j50 RunSettingsRoboTests
Change-Id: I8b786272f50680e9e388ca64bb8d3410b85b327a
 2021-03-03 17:02:07 +08:00
Paul Hu
8c38e9543e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
 2021-03-03 08:07:19 +00:00
Sally Yuen
aaff760df0 Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev 2021-03-03 03:03:35 +00:00
Paul Hu
ddf3efb070 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
 2021-03-03 02:59:37 +00:00
Minche Li
ecf1c07e63 Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev 2021-03-03 02:24:09 +00:00
Paul Hu
2b1e3a971f Merge "Update Utils#getTetheringLabel usage on Settings" 2021-03-03 02:15:22 +00:00
Sudheer Shanka
521bf40280 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2aac37f3686f6d46e3cace0dcbd0c4a4886e1cfb
 2021-03-03 00:36:23 +00:00
Sudheer Shanka
1e04fd7a05 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1959ff61fdc91f0006d9eda91ccde6917025e07c
 2021-03-02 23:54:36 +00:00
Bonian Chen
3f211d4c64 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev 2021-03-02 23:19:24 +00:00
Sudheer Shanka
bf29c73cb7 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
 2021-03-02 23:01:32 +00:00
Yu-Han Yang
f7513d9821 Add showSystem to RecentLocationAccess (Settings) 
Bug: 180533061
Test: on device
Change-Id: Ie232bc84d7875897316e978ed3deac9656ebec5f
 2021-03-02 14:05:35 -08:00
Sudheer Shanka
90f59be59a Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." 2021-03-02 21:55:30 +00:00
Janis Danisevskis
b5caf84154 Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0 
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.

Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
 2021-03-02 13:52:46 -08:00
Treehugger Robot
2a6d2e4a2d Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
 2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
 2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
 2021-03-02 19:05:16 +00:00