PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,419 Commits 1 Branch 0 Tags
aebc5db4f32cdf4449d119ea79b2e044e47a887c
Commit Graph

78419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xiangyu/Malcolm Chen
aebc5db4f3 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-15 04:53:44 +00:00
Yi Jiang
cf9e39b2f3 Merge "Grays out Screen Timeout Setting when disabled." 2020-12-15 02:59:04 +00:00
Jiashen Wang
881d253247 Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity" 2020-12-15 01:32:15 +00:00
Diego Vela
afdf5ed0d4 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb am: 25ee8c7cf0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6db438a43e58f0ee0df43c12cb1db69ed1ae218d
 2020-12-14 22:56:14 +00:00
Diego Vela
ed5986c335 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d am: acba236677 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief413bfbeadd5c47529d7dade9dad7e365d8b3bb
 2020-12-14 22:55:50 +00:00
Diego Vela
25ee8c7cf0 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a772056ff7f76d79e2f4864e0e796b5fddc1a27
 2020-12-14 22:38:33 +00:00
Diego Vela
acba236677 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04da28694d92bf00afee8eec26f6cf9dc63e13a4
 2020-12-14 22:25:47 +00:00
Diego Vela
8403231bbb Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b27110024a7422343149b0eff00ed97bc726419
 2020-12-14 22:24:05 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information." 
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
 2020-12-14 22:05:04 +00:00
Diego Vela
9d61c8a23d Merge "Revert "Add <uses-library> information."" am: 54b741096b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54a0349bf3590b40165d2205171e9c58a0a7b6f
 2020-12-14 21:59:32 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information." 
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
 2020-12-14 21:14:24 +00:00
TreeHugger Robot
92107059b1 Merge "Add a developer option to enable / disable location indicators." 2020-12-14 20:16:23 +00:00
Malcolm Chen
3ad8509b15 Automatically dismiss SIM combination warnings and selection dialogs. 
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
 2020-12-14 11:55:07 -08:00
Yi Jiang
942e598092 Merge "Adds 'options disabled by admin' icon in timeout settings." 2020-12-14 18:06:50 +00:00
TreeHugger Robot
d05ee585dc Merge "[Provider Model] Refactor AirplaneSafeNetworksSliceTest" 2020-12-14 10:31:45 +00:00
Yi Jiang
aed7559a59 Adds 'options disabled by admin' icon in timeout settings. 
Bug:171257091
Test: atest ScreenTimeoutSettingsTest

Change-Id: Id0411b009a2d4dc0e4f6abf2825580ca42ad8442
 2020-12-14 00:31:51 -08:00
Weng Su
732cdb42b2 [Provider Model] Refactor AirplaneSafeNetworksSliceTest 
- The AirplaneSafeNetworksSliceTest should restore Airplane Mode state
after tear down

- Create AirplaneModeRule to backup/restore Airplane Mode state
automaticlly

- Plan to reuse the AirplaneModeRule for other test case

Bug: 173413889
Test: atest -c AirplaneSafeNetworksSliceTest
Change-Id: Id142cf6302a188e6d82b44fcf29a395dc21f6013
 2020-12-14 07:20:32 +00:00
Wei Wang
edbe2cca13 Add a developer option to enable / disable location indicators. 
Also bundled location related developer options into the location
category.

Bug:175357420

Test: Manual && make RunSettingsRoboTests ROBOTEST_FILTER=LocationScanningPreferenceControllerTest

Change-Id: Ic33ad6e70d258c9afc2cefba70ab6e7b2bafd16a
 2020-12-13 21:33:56 -08:00
Jeremy Goldman
e092a54381 Merge "Update string for discarding changes to a particular APN's settings." 2020-12-14 04:42:09 +00:00
Jeremy Goldman
793225f699 Merge "Precommit hook added to Settings, preventing the creation of new Robolectric tests." 2020-12-14 02:59:39 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290 Update string for discarding changes to a particular APN's settings. 
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
 2020-12-14 02:57:39 +00:00
Jeremy Goldman
f36154fe6c Merge "ActiveSubsciptionsListenerTest converted to junit" 2020-12-14 02:52:33 +00:00
Jeremy Goldman
f36d82f5fe Merge "Settings JUnit test for PreferredNetworkModeContentObserverTest" 2020-12-14 02:52:16 +00:00
TreeHugger Robot
e1f15ccc1d Merge "Add the mutability flag to BluetoothDevicesSlice." 2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37 Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue" 2020-12-13 15:18:40 +00:00
Bonian Chen
c3d818653a Merge "Add test case for CrossSimCallingPreferenceControllerTest" 2020-12-12 11:31:16 +00:00
Yi Jiang
111004958d Grays out Screen Timeout Setting when disabled. 
Previously we would hide the screen timeout setting when it is disabled
by admin. Instead of hide it in Display Settings, now we gray it out and
also provide the info of the enforced admin.

Bug: 174834978
Test: manually
Change-Id: Idaa3c4512eb648b67fcf6df2996c771a2f1b9617
 2020-12-11 15:53:45 -08:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit 
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
 2020-12-12 01:11:13 +08:00
Jeremy Goldman
bb811a5aff ActiveSubsciptionsListenerTest converted to junit 
note that this class contains a state machine of the subscription
information cache. The mock subscription manager must present
subscriptions in order for an update intent to result in a change
notifcation.

Bug: 175389659
Test: atest -c ActiveSubsciptionsListenerTest
Change-Id: I8cd2bd5d5b7b1539f421822ba77ed3d8e0ac493b
 2020-12-11 16:23:40 +00:00
Jeremy Goldman
e18207b951 Settings JUnit test for PreferredNetworkModeContentObserverTest 
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
 2020-12-11 16:23:33 +00:00
Jeremy Goldman
1e87a55215 Add test case for CrossSimCallingPreferenceControllerTest 
Test is currently failing due to no methods present. Since we want
the controller to be unavailable for now, I chose to write a method
verifying that state.

Bug: 174566774
Test: atest -c CrossSimCallingPreferenceControllerTest
Change-Id: Iced0ac7bbd3482907312182a632dcf3215c55391
 2020-12-12 00:22:45 +08:00
Zim
abb239f4a4 Change transcoding default values 
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/

This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything

Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
 2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7 Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device." 2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device. 
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
 2020-12-11 20:29:13 +08:00
Robert Luo
b2cec8fd84 [automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7 -s ours am: 3107b30f49 -s ours 
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2a2e7c2861cef58411a3e9eb4053f7c44af2fc3
 2020-12-11 11:04:37 +00:00
Robert Luo
42035bcf6f [automerger skipped] Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp am: a2e12619d5 -s ours 
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 d7cfa55286 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b1c72d78fb7e5bf14143a0160bc2e6d1007b97e
 2020-12-11 11:02:06 +00:00
Yi-Ling Chuang
32e7118161 Add the mutability flag to BluetoothDevicesSlice. 
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.

Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.

Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
 2020-12-11 15:32:23 +08:00
Robert Luo
3107b30f49 [automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7 -s ours 
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae60c309ec6cf303dc5554f6c9d82fc7f6b088ac
 2020-12-11 07:13:10 +00:00
Robert Luo
4dd011b3c7 Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev 2020-12-11 06:56:24 +00:00
YUKAI HUNG
c0f50f59b3 Merge "Fix failure BatteryInfoTest after string is update" 2020-12-11 02:42:42 +00:00
Robert Luo
a2e12619d5 Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp 2020-12-11 02:15:47 +00:00
TreeHugger Robot
cda9876fe8 Merge "Don't depend on shadow IRoleManager." 2020-12-11 01:54:12 +00:00
TreeHugger Robot
7c7dde7768 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e05f1a4bb7 -s ours am: 04e97d441d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97fbf398ab14dd3a0d855afec6c8a2a6b39a8e78
 2020-12-11 01:22:48 +00:00
ykhung
351ffbeac9 Fix failure BatteryInfoTest after string is update 
Bug: 175277366
Test: make RunSettingsRoboTests -j40
Change-Id: I142ba70548c6dac9bfc33e0833c99da188817023
 2020-12-11 09:16:19 +08:00
TreeHugger Robot
04e97d441d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e05f1a4bb7 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie055bb147e9bb33ddd6508aa69147b95ec49d932
 2020-12-11 01:05:20 +00:00
TreeHugger Robot
36cf656242 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-11 00:29:28 +00:00
TreeHugger Robot
057c519b9b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-11 00:12:32 +00:00