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

80587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b9020bc424 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours am: 0369e03b49 -s ours am: 55367c223a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bed31d86beb49b373d893f083ecba5421d058fa
 2021-03-23 14:34:07 +00:00
Janis Danisevskis
5914c75920 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 am: a308ea1915 am: 48e5f318db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: If48136fb98e048a7ec815f00e59dd70434cadc25
 2021-03-23 14:32:37 +00:00
SongFerng Wang
9680248c4a [automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d am: 8722e00b4a -s ours am: ce8ecb5ca9 -s ours 
am skip reason: skip tag Change-Id I9d2abe1abe3082267ed64b71602d8ada21c95c6c with SHA-1 1dcc788177 is already in history

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

Change-Id: I81818256549d846a71e31c90da9ef65626ed9616
 2021-03-23 14:31:00 +00:00
Bonian Chen
5ef0f51762 Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a am: 1f5c043b0c am: 49da45d973 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: I7423a86f82e32c00549cb5894e14123065dc0f3e
 2021-03-23 14:30:23 +00:00
Bonian Chen
67ff8b5882 [automerger skipped] Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 am: f9f2fe3f84 -s ours am: 836b5bb4d1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I160e2ddc47113c1229b8aa7a3838488cda3a463e
 2021-03-23 14:30:19 +00:00
Bonian Chen
04aaecb037 Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea am: 6a4d7b65d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I1e32572c621d64c233cc6732f357b2df45e36540
 2021-03-23 14:30:17 +00:00
Bill Yi
55367c223a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours am: 0369e03b49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92f936bff737f7872ca8641d59ef1e02210bcfb8
 2021-03-23 14:11:09 +00:00
Janis Danisevskis
48e5f318db Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 am: a308ea1915 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I49cad17eab31b7531cb710915cbc57accd894598
 2021-03-23 14:10:20 +00:00
SongFerng Wang
ce8ecb5ca9 [automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d am: 8722e00b4a -s ours 
am skip reason: skip tag Change-Id I9d2abe1abe3082267ed64b71602d8ada21c95c6c with SHA-1 1dcc788177 is already in history

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

Change-Id: I9f1bf7edff62c29730ded4f6cd83626f53a4c873
 2021-03-23 13:56:48 +00:00
Bonian Chen
49da45d973 Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a am: 1f5c043b0c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: I39c189e576ac4fb42d722936f65ea03580793f6b
 2021-03-23 13:55:43 +00:00
Bonian Chen
836b5bb4d1 [automerger skipped] Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 am: f9f2fe3f84 -s ours 
am skip reason: skipped by user bonianchen

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

Change-Id: Ib85316b2193f4056f8818d98ae9899fd5c5c783a
 2021-03-23 13:52:50 +00:00
Bonian Chen
6a4d7b65d0 Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I905f9d1646a9d9ea70e42c4b5368ff983611bee3
 2021-03-23 13:52:46 +00:00
Jeff Sharkey
7f7d7124a7 Request new Bluetooth runtime permissions. am: 9e07eab08f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13956086

Change-Id: I32ac0512e260ad9cfe064b89f89c104ec708cedd
 2021-03-23 13:10:59 +00:00
Jeff Sharkey
9e07eab08f Request new Bluetooth runtime permissions. 
An upcoming platform change is introducing a new "Nearby devices"
runtime permission which contains the new BLUETOOTH_CONNECT and
BLUETOOTH_SCAN permissions.

We have logic in place to use <split-permission> to translate the
older BLUETOOTH and BLUETOOTH_ADMIN permissions into these new
runtime permissions, but modern apps will need to pivot to
requesting them directly as part of targeting Android S.

This change requests both the old and new permissions to avoid
breakage while the new permission enforcement is being phased in.

Bug: 181813006
Test: atest CtsPermission2TestCases
Test: atest CtsPermission3TestCases
Test: atest CtsStatsdAtomHostTestCases
Change-Id: I0a6ff040520deaa7c7a6fecd83e8608a9bf28c4a
 2021-03-23 12:35:36 +00:00
Wesley.CW Wang
a8e2712249 Remove Battery Settings page default tips am: 3a52e335be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922078

Change-Id: Icfc40818ec0846684fe8ec94dedbf1677d6f9d23
 2021-03-23 09:05:16 +00:00
Wesley.CW Wang
3a52e335be Remove Battery Settings page default tips 
- Remove SummaryTips from default tips
 - Clean up test file import
 Screenshot: https://screenshot.googleplex.com/6rYrnMvoTbeCS7m.png

Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: I1001d75235a6d8d5947b974939884103eb0834da
 2021-03-23 08:44:42 +00:00
Weng Su
8d073e588e Merge "[Provider Model] Remove unused strings." into sc-dev am: f732a95ffd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960249

Change-Id: I6680990e0c8c049a02f13c2348089a35e7dca5f6
 2021-03-23 08:42:04 +00:00
Weng Su
f732a95ffd Merge "[Provider Model] Remove unused strings." into sc-dev 2021-03-23 07:47:22 +00:00
TreeHugger Robot
688ba7f845 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2103dda97c -s ours am: 006b8db0b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1441e64e570b3096cf1cf971f0a424ba2dd7acf1
 2021-03-23 06:11:45 +00:00
TreeHugger Robot
006b8db0b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2103dda97c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I519f38b3ea945dbc1cae1e5c03add21fcde2ac0d
 2021-03-23 05:54:09 +00:00
Bill Yi
0b57a96e07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1d35aad4e -s ours am: 2a7ebaab5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5fbf228851ad460e637f291fa7f2a63b67ddef9
 2021-03-23 05:50:38 +00:00
Bill Yi
2a7ebaab5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1d35aad4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5ed73173223c443a9fe48e3eeabc9ce60ea4724
 2021-03-23 05:31:12 +00:00
Bonian Chen
115c422b8b Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev am: 238ad87750 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946308

Change-Id: I5377a826b8332f90426b119f04908ea4e72cff10
 2021-03-23 05:27:47 +00:00
Bill Yi
0369e03b49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68e59e49c7642acd59eb289437174bd5bee606f3
 2021-03-23 05:08:23 +00:00
TreeHugger Robot
2103dda97c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-23 05:05:47 +00:00
Bonian Chen
238ad87750 Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev 2021-03-23 04:50:54 +00:00
Janis Danisevskis
a308ea1915 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
 2021-03-23 04:09:47 +00:00
Weng Su
5b6f1a0910 Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev am: b30db25d8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946493

Change-Id: Iddec8c1786121282291314217ceaa2a43e07dc32
 2021-03-23 03:53:12 +00:00
Weng Su
c05d21e2fa Merge "[Provider Model] Update Internet preference summary" into sc-dev am: 5ac8414834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946630

Change-Id: I7c9f89b4c4c9b074b4a7941b6bb4bdde0a51cc6d
 2021-03-23 03:51:43 +00:00
Janis Danisevskis
c90b511239 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I75e8e09c230cfb805ab3b2d6699aca2cd2514eac
 2021-03-23 03:51:26 +00:00
Weng Su
22339eb505 [Provider Model] Remove unused strings. 
Bug: 183459230
Test: build passed
Change-Id: I4ca000659172e568245c7a431f571be3d83e50e0
 2021-03-23 11:40:36 +08:00
Weng Su
b30db25d8c Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev 2021-03-23 03:24:18 +00:00
Weng Su
5ac8414834 Merge "[Provider Model] Update Internet preference summary" into sc-dev 2021-03-23 03:21:08 +00:00
Janis Danisevskis
7aa99fe966 Merge "Keystore 2.0: Remove references to Keystore 1.0" 2021-03-23 03:14:28 +00:00
Bill Lin
d254c017ab Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev am: 9f046e55b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13856783

Change-Id: I7323e8bf232f3304c00749f47ac9b455644bc0c6
 2021-03-23 01:51:49 +00:00
Bill Lin
9f046e55b6 Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev 2021-03-23 01:22:38 +00:00
Bill Yi
01da19f6a4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icad99664d1ec79ef02031537bb9a1ca851641757
 2021-03-22 21:04:30 +00:00
Peter Kalauskas
f86a127e30 Merge "Introduce guest user metrics" into sc-dev am: 01f77d8e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13935767

Change-Id: I24f8f53534dcb54a69c87d2fe795e669e9256d2f
 2021-03-22 20:54:07 +00:00
Janis Danisevskis
75a91836e7 Keystore 2.0: Remove references to Keystore 1.0 
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
 2021-03-22 13:35:53 -07:00
Peter Kalauskas
01f77d8e00 Merge "Introduce guest user metrics" into sc-dev 2021-03-22 20:17:20 +00:00
Bill Yi
a1d35aad4e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77c6e5117bcfaeac74a85a013190873900e7501d
 2021-03-22 20:08:20 +00:00
Bill Yi
5dc25d8afa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I69f56fb22074981f0776f0f8b76e98ea83a14d3f
 2021-03-22 19:38:12 +00:00
SongFerng Wang
8722e00b4a Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
 2021-03-22 19:34:15 +00:00
SongFerng Wang
d1278a3d3d Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I9acfb31454bc8d63480adc64311717c07715d6f0
 2021-03-22 19:22:27 +00:00
Sally Yuen
1199304fde Merge "Reduce RBC test flakiness" into sc-dev am: 1908c5357c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13919447

Change-Id: I9e160c50ba586bfb4ae468c81cdecd89a95a49aa
 2021-03-22 19:20:55 +00:00
SongFerng Wang
5292baf810 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" 2021-03-22 19:06:48 +00:00
Bonian Chen
0880675414 [Settings] Fix divide by zero in data usage UI 
Data usage UI got divide by zero exception when zero data usage.

Bug: 182822862
Test: local
Change-Id: Ibe57034e7d441e94c0529cb76f1a16665aaacff6
 2021-03-22 17:10:00 +00:00
Sally Yuen
1908c5357c Merge "Reduce RBC test flakiness" into sc-dev 2021-03-22 16:27:49 +00:00
Weng Su
bec3144c11 [Provider Model] Bring back the "turn on Wi-Fi automatically" option 
- Screenshot:
  https://screenshot.googleplex.com/92uXX6KQCqWxvub

Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
 2021-03-22 22:28:55 +08:00
SongFerng Wang
4c8c8011ad [automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b am: b3f2e9090a am: 34c8d35cd3 -s ours am: 2160d5fc4c -s ours 
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785 is already in history

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

Change-Id: Ib430158f3cac38c2a922eccece14b567a35eee29
 2021-03-22 14:12:13 +00:00