Jeremy Goldman
3a723e0d97
[automerger skipped] Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev am: bd9a65cca6
-s ours
...
am skip reason: skip tag Change-Id I2bee3ba100bfe636221264492a2ce98b6a664cd5 with SHA-1 3922249709
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960260
Change-Id: I8fb9d8472a41a83da01d71b7e9312c2fe729e34f
2021-03-24 01:41:31 +00:00
Jeremy Goldman
4ce5827136
[automerger skipped] Merge "Warning / Info icon added for the VPN Preference" into sc-dev am: 3bc4e93029
-s ours
...
am skip reason: skip tag Change-Id I59fd7765876fe58fe2c55929f711c04a45abbe09 with SHA-1 a7774a10e0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960259
Change-Id: Ib081eeab0774262fa52115609325ac32a6b71601
2021-03-24 01:40:21 +00:00
Tim Peng
7e6762de8a
Get low battery level through metadata
...
Bug: 183469297
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Iae8971a5c1f183fe141d4246e23d8feb6d68d0ff
2021-03-24 09:32:26 +08:00
Jeremy Goldman
814ae28dda
[automerger skipped] Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev am: 37a7b7df48
-s ours
...
am skip reason: skip tag Change-Id I528d46654a39df04b647d6d0137aaf80e7adb05c with SHA-1 5d92ad5232
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960261
Change-Id: Ib27b2e4af803e35f96feda2b22d1837869439473
2021-03-24 01:31:58 +00:00
Rajeev Kumar
a833cfa34e
Merge "Update Managed Device Info text for a financed device" into sc-dev am: cafc769a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13957892
Change-Id: I9ff9f83a3c8994ac031447dba474a47b01137a8e
2021-03-24 01:24:19 +00:00
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
Jeremy Goldman
76de845f3d
Connect VPN warning help icon with the network & internet page.
...
New VpnInfoPreference created to control the presence or absence
of the warning icon based on the vpn type.
The VpnPreferenceController type casts the preference based on
whether the provider model is enabled. It also detects legacy vpns
by using the LegacyVpnProfileStore, and comparing VPN profile
usernames with the active VPN config's user.
Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4
Test: atest -c SettingsUnitTests
Bug: Bug: 176821216
Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
Merged-In: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
(cherry picked from commit 7a68eb3b5e
)
2021-03-24 01:07:28 +00:00
Jeremy Goldman
bd9a65cca6
Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev
2021-03-24 01:01:07 +00:00
Jeremy Goldman
3bc4e93029
Merge "Warning / Info icon added for the VPN Preference" into sc-dev
2021-03-24 01:00:38 +00:00
Jeremy Goldman
37a7b7df48
Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev
2021-03-24 01:00:17 +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
cafc769a51
Merge "Update Managed Device Info text for a financed device" into sc-dev
2021-03-23 20:55:27 +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
Almaz Mingaleev
fcf1fcfe9b
Show pop-up banner when Location is off and user tries to enable GeoTZ.
...
As of now GeoTZ state remains unchanged even if user enables
Location toggle.
Bug: 152746236
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Test: checked manually that dialog opens Location settings page
Change-Id: I5fd3288e9d5a7aac3bc82da6944b4ccd6bb9e0f5
2021-03-23 19:43:49 +00:00
Robin Lee
634cd0b4e4
Move alarms_and_reminders strings to SettingsLib
...
This allows form-factor-specific Settings apps to use the strings as
well as phone settings.
Test: make installclean; make Settings; make TvSettings;
Test: make -j RunSettingsRoboTests
Bug: 181284165
Change-Id: Ibc28160999d82ec6b1f6437ae887925df29dfaff
2021-03-23 19:41:40 +00:00
Zhen Zhang
1f99d6a4b5
Update summary based on hibernated apps number
...
Update the summary of "unused apps" based on how many apps are
hibernated or auto revoked.
Test: HibernatedAppsPreferenceControllerTest
Bug: 181172051
Change-Id: I274eb3c0ada3d063937368232f31e52c20287552
2021-03-23 11:10:43 -07: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
Bonian Chen
d5ccde31a8
[Settings] Support getSystemService(Class<T>)
...
Add getSystemService(Class<T>) to align the capability with framework
part.
This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047
Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
Salud Lemus
a9a24372fd
Update Managed Device Info text for a financed device
...
Bug: 183448705
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Change-Id: Iea2567e7943b122c6c6d2772380f8ddd57066a3f
2021-03-23 16:39:56 +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
Arc Wang
711008eb2c
Add Strings for Storage Settings
...
Bug: 170918505
Test: build pass
Change-Id: If977e93087602946163726b47c737f2a36b0bb38
2021-03-23 20:57:31 +08: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
Alex Johnston
46c72f3cac
Settings: Disable USB preferences if USB signaling is off
...
* When developer options is turned
off and on again, 'Default USB
configuration' and 'Disable USB
audio routing' should not be enabled
if USB data signaling is disabled.
Manual testing:
* Disable USB data signaling
* Verify preferences are disabled
* Turn developer options off and on
* Verify preferences remain disabled
Bug: 180711035
Test: manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
Change-Id: Id08228da812b7534e2217b0c3f30a7ac989f7553
2021-03-23 11:43:28 +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
Jeremy Goldman
ab8eeca966
Gear Preference on VPN page includes subtitle if the vpn is an insecure
...
type
Test: atest SettingsUnitTests
Screenshot: https://screenshot.googleplex.com/BWfUf6hcHNnbLvH
Bug: 176821216
Change-Id: I2bee3ba100bfe636221264492a2ce98b6a664cd5
Merged-In: I2bee3ba100bfe636221264492a2ce98b6a664cd5
(cherry picked from commit 3922249709
)
2021-03-23 08:38:12 +00:00
Jeremy Goldman
8deea775df
Warning / Info icon added for the VPN Preference
...
Within the Provider Model, we would like to show a warning icon if the
user is detected to be using an insecure vpn type. This adds an icon for
that warning, and an imageview containing that layout to settings
Icon: https://screenshot.googleplex.com/644ZsGtVDp6hgZq
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I59fd7765876fe58fe2c55929f711c04a45abbe09
Merged-In: I59fd7765876fe58fe2c55929f711c04a45abbe09
(cherry picked from commit a7774a10e0
)
2021-03-23 08:37:29 +00:00
Jeremy Goldman
222dd91102
Legacy VPN Configuration Dialog includes error message if VPN is an
...
insecure type.
Screenshot: https://screenshot.googleplex.com/53pAJuhTDLJW4Em
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I528d46654a39df04b647d6d0137aaf80e7adb05c
Merged-In: I528d46654a39df04b647d6d0137aaf80e7adb05c
(cherry picked from commit 5d92ad5232
)
2021-03-23 08:37:11 +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