PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,346 Commits 1 Branch 0 Tags
e6eb753eca641d1618e802805cdd11a1bbbc299c
Commit Graph

80346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ec189cc0da 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: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
 2021-03-03 21:41:50 +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
Trevor David Black
d0d796c90b Add Extra App Info into Settings App UI. 
Bug: b/174956516
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: Id978fb3569579f54b8399156d52c2ddeceb9bb91
 2021-03-03 19:52:15 +00:00
Almaz Mingaleev
419834be48 [automerger skipped] Update GeoTZ strings. am: 18ae34ec90 -s ours 
am skip reason: Change-Id Iab177297e9047ff3b6e9452876061cdaa0740ef1 with SHA-1 fa79ee6727 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I356845337ae4a28dde9a490cadf048cc7fe706ef
 2021-03-03 19:03:55 +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
Almaz Mingaleev
20d5a7c946 Merge "Update GeoTZ strings." 2021-03-03 17:20:11 +00:00
Almaz Mingaleev
fa79ee6727 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
 2021-03-03 17:19:55 +00:00
jasonwshsu
c497c7aabe Add the preference controller to control accessibility button opacity preference 
Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
 2021-03-04 01:19:30 +08:00
jasonwshsu
04955b96ae Add the preference controller to control accessibility button size preference 
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
 2021-03-04 01:19:30 +08:00
jasonwshsu
123464429d Add the preference controller to control accessibility button location preference 
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
 2021-03-04 01:19:19 +08: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
f11a6ddaf2 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: Iaae85597ea364bab628f8fce9230d7887c4f6466
 2021-03-03 15:39:29 +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
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
d41839e69e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e am: 0df55e1eb4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49005966712f2d6aee155375546ae5554aa6bce1
 2021-03-03 13:38:25 +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
551319a151 Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe97019bc21e9c44a97b57d61da05091d4de790d
 2021-03-03 13:03:35 +00:00
TreeHugger Robot
10c997f5bb Merge "Refactor Usb settings" into sc-dev am: decaeda453 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb5da138a1dbdd6fde3daf48c2a4de0988505297
 2021-03-03 13:03:27 +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
TreeHugger Robot
65046b06a3 Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev am: d1718c3a15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bfb4405902d4a11100a8302345b23468637f7c2
 2021-03-03 10:54:49 +00:00
Thiebaud Weksteen
7e310adec6 Merge "Add summary for 2G toggle option" into sc-dev am: c1110efc19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee2648d4cd5487fbc8ef647802c861140ae1f79b
 2021-03-03 10:53:30 +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
Zoey Chen
ea29704e40 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5 
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
 2021-03-03 16:23:52 +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
bd7a6cc05e Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081571447b34652fffc03f5eba756c6d88db2a8f
 2021-03-03 03:23:10 +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
Minche Li
d8b3c23f77 Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f08f51b0ff9df1ef9a1b4c609155fdd102cef80
 2021-03-03 03:00:54 +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
303438ea68 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05 am: 521bf40280 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I644594be3f6bb7d402ba6ba60b549624a1457110
 2021-03-03 01:15:46 +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
Bonian Chen
d929097128 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbaa1dae43d694a447761f46d3f48dd255e1b50d
 2021-03-03 00:18:58 +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
e696e52fd3 Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee am: 2a6d2e4a2d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011ebcf279e1efb16399efe6222a63e8f80c7571
 2021-03-02 21:05:12 +00:00