Jeremy Goldman
11bdc74dbb
Merge "Connect VPN warning help icon with the network & internet page." into sc-dev am: 025301da1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975106
Change-Id: Id8771eae0a68c8ad6236cdca9b82d90fcb4eba76
2021-03-24 05:45:28 +00:00
Jeremy Goldman
dcbde1138b
VpnPreferenceControllerTest converted to JUnit
...
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.
Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
Merged-In: I94a881df13d1b35126de10f561d657136e4fed7f
(cherry picked from commit 7361f8557c )
2021-03-24 05:33:13 +00:00
Weng Su
0b34d62f6b
Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
2021-03-24 05:25:04 +00:00
Jeremy Goldman
025301da1f
Merge "Connect VPN warning help icon with the network & internet page." into sc-dev
2021-03-24 05:18:46 +00:00
Weng Su
5cb66024fc
Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev
2021-03-24 04:56:55 +00:00
Bonian Chen
4832bf0faf
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev am: 8debbfa8a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13973145
Change-Id: I69b1643a9a389f0bc4849e3d5131c166c30ba00b
2021-03-24 04:45:32 +00:00
Bonian Chen
8debbfa8a4
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev
2021-03-24 04:13:35 +00:00
tim peng
534b2b36ff
Merge "Get low battery level through metadata" into sc-dev am: 80f803c337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960258
Change-Id: I54e52065adaaa985f65c3ecd5b69f4f54ab70173
2021-03-24 04:00:12 +00:00
tim peng
80f803c337
Merge "Get low battery level through metadata" into sc-dev
2021-03-24 03:27:30 +00:00
Yi-Ling Chuang
954bffe965
Update category names in Display page
...
Update Visibility to Appearance and General to Other display controls.
Fixes: 183554415
Test: rebuild and launch Display settings.
Change-Id: I622e78b43230201faebc2c77e9cccb8a425f1e5b
2021-03-24 10:49:27 +08:00
Arc Wang
40b8484582
Merge "Add Strings for Storage Settings" into sc-dev am: e57972c2d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13970089
Change-Id: Ic3e09219eb4dddfc00da49c8df718925750a72da
2021-03-24 02:35:44 +00:00
Ahaan Ugale
63fb2f10d5
Autofill Settings: Display the number of saved passwords.
...
We bind to each available AutofillService, fetch the number of saved
passwords, then unbind and update the UI.
Each ServiceConnection is wired up to the controller's lifecycle so they
can be unbound when the lifecycle owner is destroyed.
Bug: 169455298
Test: manual - check value in the UI
Test: manual - no ServiceConnection leak, even when there's no response
Test: atest \
SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I7008e979e9292b99c8611010e49b3e738c82bfed
2021-03-23 19:33:48 -07:00
Arc Wang
e57972c2d5
Merge "Add Strings for Storage Settings" into sc-dev
2021-03-24 01:44:54 +00:00
Jeremy Goldman
34e8f315e3
Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev am: bd9a65cca6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960260
Change-Id: I7cb414842a1e51aedcbd6fb2750eaf7beb334239
2021-03-24 01:34:12 +00:00
Jeremy Goldman
023d1bc080
Merge "Warning / Info icon added for the VPN Preference" into sc-dev am: 3bc4e93029
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960259
Change-Id: Iadbd13e3625061c31973ed9c903e2d2dcb849126
2021-03-24 01:33:58 +00:00
Jeremy Goldman
9e502b6a60
Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev am: 37a7b7df48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960261
Change-Id: I1e3e4ee2755bfaaf50e2e4b23a78bb6bc847fb15
2021-03-24 01:33:12 +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
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
Rajeev Kumar
e9f8a7c812
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: Iaa90af0ae9aa338a4c94be432ded24ddb968072a
2021-03-23 21:29:35 +00:00
Rajeev Kumar
88127c8111
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: I4b11a3446826546fac84adc538d5831baf385947
2021-03-23 21:29:30 +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
2ceb0d8231
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: I4b93ab5fd8e31979db0da4b1d8269bf98ba246f5
2021-03-23 18:09:48 +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
0d169f2a68
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: I01546ff5478dc1411c1bcae4af8da13b81741ceb
2021-03-23 17:33:15 +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
06a84befd5
[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: Iaba3b51211c7ae51a093b4bce8d6b36090307b28
2021-03-23 14:34:43 +00:00
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
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