Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,440 Commits 1 Branch 0 Tags
bb96edf359e236fc178dad1b05d6401cefd01436
Commit Graph

78440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bb96edf359 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic74400c2f6e03cabfa3a8f6843942140a799b773
 2020-12-17 12:12:20 -08:00
Pasty Chang
2715e885cf Merge "Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings" 2020-12-16 05:35:31 +00:00
TreeHugger Robot
7f5e061b77 Merge "Mark emergency gesture container view unimportant for a11y." 2020-12-16 02:47:35 +00:00
Fan Zhang
6e999c5004 Mark emergency gesture container view unimportant for a11y. 
Similar to change I415090fb8601bc4cb129999a50ac35e045ef7830, the
container has nothing meaningful for accessibility tools. Marking it
unimportant forces children view's accessibility events to show up.

Fix: 175515538
Fix: 175515122
Test: manual
Change-Id: Ib9c9b67622f7ea67368dc3fe04c78c984b70c7e5
 2020-12-15 13:09:02 -08:00
Wesley.CW Wang
0306871503 Update Battery Defender tips title am: ee1d07d59b am: 421cbc63ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25a3e0f2e6f0bb2369149c02009262ef89c315e0
 2020-12-15 19:09:58 +00:00
Wesley.CW Wang
421cbc63ad Update Battery Defender tips title am: ee1d07d59b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib651d0c708471af6cac52255b25159730269843e
 2020-12-15 18:48:30 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title 
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
 2020-12-15 10:21:06 +00:00
Jeremy Goldman
f705f7933e Merge "Remove Settings robolectric tests which also have a junit test." 2020-12-15 07:41:20 +00:00
tim peng
b802a1a878 Merge "Remove MediaOutputGroupSlice" 2020-12-15 07:10:03 +00:00
Hugh Chen
2b1473002a [automerger skipped] Add condition to check case of accessory combinations am: b767df1a08 am: 416110bac0 -s ours 
am skip reason: Change-Id I7c80f02de5340799e292949608e19b86b187b982 with SHA-1 7d71081d45 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I033d1b9b5eb516dd781304b2627da1ebe8a8728a
 2020-12-15 05:17:39 +00:00
Hugh Chen
c832433b40 [automerger skipped] Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283 am: c61ec502f5 -s ours 
am skip reason: Change-Id I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48 with SHA-1 3251a04ba3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d8fda135546ba928e85163a58c50b5d188dbea5
 2020-12-15 05:17:33 +00:00
Hugh Chen
542a60b1f9 [automerger skipped] Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c am: 2676dd763c -s ours 
am skip reason: Change-Id I0eca89a23670c674b74753fc526256cc1d52e759 with SHA-1 af0a45bb7a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2d75719fbb02a2b95abb312f8966eff50ad2ca2
 2020-12-15 05:17:19 +00:00
Jeremy Goldman
be4d554bd3 Remove Settings robolectric tests which also have a junit test. 
Before the JUnit test suite was a blocking presubmit, new junit tests
would be written without removing the old robolectric test. Now that the
JUnit tests are productionized, we can remove the robolectric tests if
there is also an associated Junit one.

Utility script which was used to generate this list can be found at
https://paste.googleplex.com/5113068112576512.

Bug: 175389659
Test: atest SettingsUnitTests
Change-Id: Iabf4dbcccd573e9e1482b3a3e61c0f169f81bcb4
 2020-12-15 13:07:45 +08:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
 2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
 2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
 2020-12-15 05:01:25 +00:00
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
timhypeng
1602bccd9e Remove MediaOutputGroupSlice 
Bug: 170558292
Test: build pass
Change-Id: I06c710a8b06c8666cb2cf5198d5b59eda7a7649a
 2020-12-15 09:47:39 +08: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
Pasty Chang
11f78cff26 Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings 
The attribute sudMarginSides would be removed, after it splits to sudMarginStart and sudMarginEnd.

Bug: 173747770
Bug: 173752328
Test: atest & manual test
Change-Id: If2d72aa5d6ab75a4386d3c09f5a649e20bc59b1b
 2020-12-14 09:27:53 +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
Hugh Chen
b767df1a08 Add condition to check case of accessory combinations 
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45)
 2020-12-14 07:32:41 +00: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
Hugh Chen
e8dc7bc283 Do nothing when choosing file transfer when in accessory mode 
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
Merged-In: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
(cherry picked from commit 3251a04ba3)
 2020-12-14 06:59:06 +00:00
Hugh Chen
91ed63124c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. 
- Before this CL, the usb receivers didn't check the extra information
  of the accessory. It causes the usb menu not to be aware that the
  usb port is switched to accessory mode.

  In this CL, the receivers will check whether the intent has an
  accessory extra. If the usb port is switched to accessory mode
  the usb menu will switch to "File Transfer/Android Auto".

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
Merged-In: I0eca89a23670c674b74753fc526256cc1d52e759
(cherry picked from commit af0a45bb7a)
 2020-12-14 06:58:26 +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