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

80732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rajeev Kumar
ef0f32b796 Merge "Update Privacy Settings text for a financed device" into sc-dev am: d85317e4e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879465

Change-Id: I4c4c00f7709c86669824cc18667c39c825f93726
 2021-03-24 01:24:16 +00:00
Oli Lan
3b6a4b9e1e Merge "Update strings for clipboard access notification setting." into sc-dev am: 8a2e489ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959958

Change-Id: Ife3ee0d2698338385f12c0e0c280120832590d12
 2021-03-24 01:21:03 +00:00
Dmitri Plotnikov
f2c66754b9 Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev am: 5cc7c7c1de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955156

Change-Id: I16b44fc5aea9bd66d28a96ec05f9d4e88d37f103
 2021-03-24 00:59:44 +00:00
Rajeev Kumar
d85317e4e5 Merge "Update Privacy Settings text for a financed device" into sc-dev 2021-03-23 20:55:27 +00:00
Oli Lan
8a2e489ac8 Merge "Update strings for clipboard access notification setting." into sc-dev 2021-03-23 17:43:41 +00:00
Dmitri Plotnikov
5cc7c7c1de Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev 2021-03-23 17:29:35 +00:00
Salud Lemus
930df91e66 Update Privacy Settings text for a financed device 
Bug: 182802692
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest

Change-Id: Icc131252430cd147e2a06ba2aa260f6ea26734bb
 2021-03-23 16:06:01 +00:00
Oli Lan
468278661f Update strings for clipboard access notification setting. 
This changes the strings for the clipboard notification
setting in line with UX recommendations.

Bug: 182349993
Test: Build & install, check setting is displayed correctly
Change-Id: Ife2cf4fa6ee98069170ec02a0c3fb7a0880a90b8
 2021-03-23 15:30:08 +00:00
TreeHugger Robot
70ee5dd130 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours am: 5d8e7a260d -s ours am: d8c9a53931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdbcbed50a9dcb887925304685c8e1e14a8c9651
 2021-03-23 14:40:38 +00:00
Bill Yi
f720003e12 [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: Idb814ecf1446317025c026769e1a56715a366cc6
 2021-03-23 14:40:33 +00:00
Janis Danisevskis
ae536e8132 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: I5d2b5c02573fdbebff2e8269432be4f1e07b8430
 2021-03-23 14:34:05 +00:00
SongFerng Wang
5b3c230373 [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: I1dfb2713bc963b7c7b33f4154da4d934ac7b956d
 2021-03-23 14:31:04 +00:00
Bonian Chen
9aefa37043 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: Id673f1877af07846afe092afd6233eceb589d6c8
 2021-03-23 14:29:53 +00:00
Bonian Chen
b5f070926c [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: I09815ce4c139e0d949431244f73d6af45be292b5
 2021-03-23 14:29:46 +00:00
Bonian Chen
edba1525af 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: I258f0eabc6f9ac714940e66aaf3d316386635000
 2021-03-23 14:29:44 +00:00
TreeHugger Robot
d8c9a53931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours am: 5d8e7a260d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I606bd66f1477f187249af72ad0522f6de3522aad
 2021-03-23 14:11:14 +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
89a1c7bfc0 Request new Bluetooth runtime permissions. am: 9e07eab08f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13956086

Change-Id: I8517c50feb1d53bc018d8b1a748c4c72469fb4b3
 2021-03-23 13:10:31 +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
201445f80a Remove Battery Settings page default tips am: 3a52e335be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922078

Change-Id: I78509dc0c432c3b0f122560aa1718feb89535d3b
 2021-03-23 09:05:19 +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
3032c9409d 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: Id3021983d45bd79459b6e059101ba0478f88cd19
 2021-03-23 08:40:06 +00:00
Weng Su
f732a95ffd Merge "[Provider Model] Remove unused strings." into sc-dev 2021-03-23 07:47:22 +00:00
TreeHugger Robot
94746cbba4 [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: If4c9841b749fc1e88a37930340ee8b186e72e05b
 2021-03-23 06:11:25 +00:00
Jeremy Goldman
8242542559 Merge "Update string for editing an insecure VPN." 2021-03-23 05:57:13 +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
dd300c2fae [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: I06cf5b1b90de87fd1fdef5cfb6854fc46abedc14
 2021-03-23 05:50:11 +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
99e59b750d 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: Ib6bbfac4ff4566538f6de2a99b9fe7e8beb74fd9
 2021-03-23 05:26:48 +00:00
TreeHugger Robot
5d8e7a260d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc47e9e3a24a3bf4165bfa9e69b2bdd92e6ba6b9
 2021-03-23 05:08:28 +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
TreeHugger Robot
21802a4598 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-23 04:35:07 +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
927481b88f 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: I2dcd5b6ee3d05af196c1bd46ca00ce29e3e54d13
 2021-03-23 03:52:28 +00:00
Weng Su
7d014ffba6 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: I00bb8802a22b50833dd244a9517a01f7f659ab9a
 2021-03-23 03:51:51 +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
Jeremy Goldman
ec4b612932 Update string for editing an insecure VPN. 
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: I3392c24fd158199f26da2508f1bad1fbf858fe28

Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
 2021-03-23 10:48:39 +08:00
Jeremy Goldman
18acf73b5f Merge "Unit tests for the VpnInfoPreference." 2021-03-23 02:38:24 +00:00
Jeremy Goldman
af7371cdcb Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." 2021-03-23 02:38:05 +00:00