Zhen Zhang
d64dff2c98
Merge "Update summary based on hibernated apps number" into sc-dev am: 59aa4f9cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955152
Change-Id: I2eaf37a821808a3797d0cf620ad9eeb852c01651
2021-03-24 06:48:01 +00:00
Weng Su
caae56e51b
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
am: 0b34d62f6b
-s ours am: 81a7617077
-s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: If1fff33d2a2cd96e0599e2a17957e2ec96994228
2021-03-24 06:44:46 +00:00
Zhen Zhang
59aa4f9cb1
Merge "Update summary based on hibernated apps number" into sc-dev
2021-03-24 06:42:56 +00:00
Weng Su
81a7617077
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
am: 0b34d62f6b
-s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: I84ab62558f79fbbd263026177ee3adcc6cb90dfc
2021-03-24 06:09:03 +00:00
Jeremy Goldman
d5e5aaa818
[automerger skipped] Merge "Connect VPN warning help icon with the network & internet page." into sc-dev am: 025301da1f
-s ours
...
am skip reason: skip tag Change-Id I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401 with SHA-1 7a68eb3b5e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975106
Change-Id: Ia41af792e568a88464b13a31934f15e0a0c092c5
2021-03-24 05:45:02 +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
Bill Yi
a41fcb498d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-03-24 04:59:52 +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
90bb37b6aa
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: Iccfaf2ad15c5915d998ec291fcddd815bae6047e
2021-03-24 04:44:09 +00:00
Bonian Chen
8debbfa8a4
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev
2021-03-24 04:13:35 +00:00
tim peng
f5c366f794
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: I32f856ccd190fe6fae5f7b0e857239f1471cc469
2021-03-24 04:02:00 +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
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
8b24b3d7bc
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: I0287db081677f2448561c38402550afe673219a4
2021-03-24 01:50:44 +00:00
Arc Wang
e57972c2d5
Merge "Add Strings for Storage Settings" into sc-dev
2021-03-24 01:44:54 +00:00
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