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

80725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Almaz Mingaleev
197b3fd092 Merge "Show pop-up banner when Location is off and user tries to enable GeoTZ." into sc-dev am: 206f12fd0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13930308

Change-Id: I1d5f25b8bb5922464c422528d5ce86f81dae83df
 2021-03-25 07:28:49 +00:00
Almaz Mingaleev
206f12fd0a Merge "Show pop-up banner when Location is off and user tries to enable GeoTZ." into sc-dev 2021-03-25 07:09:43 +00:00
Ahaan Ugale
bd009abc36 Merge "Use a Quantity String for the autofill password count." into sc-dev am: 404e45d03a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13992105

Change-Id: I4c55c1fd29da2e118996e000657652215b2b50ff
 2021-03-25 07:06:43 +00:00
Ahaan Ugale
404e45d03a Merge "Use a Quantity String for the autofill password count." into sc-dev 2021-03-25 06:30:37 +00:00
Peter Wang
5f5c56c0a1 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58 am: fe042ac08e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ie03b31ba0887726aedae81bbeb5cb0f6327177a3
 2021-03-25 05:47:37 +00:00
Peter Wang
fe042ac08e Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib9676c28c112cc712f91f9e8c40b1e1e9aa61fa4
 2021-03-25 05:09:59 +00:00
Curtis Belmonte
b0ef5e3311 Merge "Add new strings for face auth/enrollment" into sc-dev am: 59cf802ee4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13987721

Change-Id: I72895b6edf859ab75d436e4d8595aa2c8c6f6b4c
 2021-03-25 04:46:36 +00:00
Sunny Shao
2754550cc4 Merge "Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement" into sc-dev am: 5a342bcb0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986128

Change-Id: I105b4df0b650e5dfc07ff580ccb11ea2fb5dbf46
 2021-03-25 04:46:06 +00:00
Curtis Belmonte
59cf802ee4 Merge "Add new strings for face auth/enrollment" into sc-dev 2021-03-25 04:31:11 +00:00
Peter Wang
204f35dc58 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: I9764d7070c44f8b8db654e9f6520d4f5c6d00cb3
 2021-03-25 04:25:54 +00:00
Sunny Shao
5a342bcb0b Merge "Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement" into sc-dev 2021-03-25 04:18:19 +00:00
Jeremy Goldman
280e53f139 Merge "Update strings in main VpnPreference." into sc-dev am: 417d5bdc7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975120

Change-Id: I6ea22825b8e79f1ccec29f56d5992e7062dd2f62
 2021-03-25 04:08:24 +00:00
Jeremy Goldman
a4056286d9 Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev am: c3723e22d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975115

Change-Id: I326fabc931440a77cd5ccecd2541d0b91a08f471
 2021-03-25 04:05:59 +00:00
Peter Wang
3cac950712 Merge "Removed unused import" am: 3fbb8612f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib2f683ebd6e5bb71d9702c698b6a112ba7b523b7
 2021-03-25 03:46:25 +00:00
Ahaan Ugale
a768fb8065 Use a Quantity String for the autofill password count. 
Bug: 169455298
Test: manual - check display with sample app and different numbers of
 passwords
Test: make RunSettingsRoboTests
Test: atest SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I12f2a415499c210df429088fe11c64e7431babb3
 2021-03-24 20:37:54 -07:00
Jeremy Goldman
417d5bdc7c Merge "Update strings in main VpnPreference." into sc-dev 2021-03-25 03:36:26 +00:00
Jeremy Goldman
c3723e22d5 Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev 2021-03-25 03:24:40 +00:00
Winson
32fc88088d Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement 
With app links v2 changes, 3P apps will need access to this screen to
prompt users to approve their domains, so remove the permission
enforcement to allow them to do so.

Bug: 178648367

Test: presubmit

Change-Id: I8819d7c82f2dc771bb0001182bb16a08401732c7
 2021-03-25 03:24:04 +00:00
Jeremy Goldman
de9d641349 Update strings in main VpnPreference. 
If there is an insecure VPN, don't display the name of the vpn in the
summary. Instead, display "Not secure" if there is only 1 total vpn
available, and display the number of insecure VPNs + " not secure."

Screenshot: https://screenshot.googleplex.com/9Bxn7frDm7aVHtG
Test: manual test (because the junit test for the controller has not yet
been cherrypicked into sc-dev)
Bug: 176821216
Change-Id: Ie454d9605effd5208457e8c91b08cc382d4992af
 2021-03-25 03:23:36 +00:00
Peter Wang
3fbb8612f5 Merge "Removed unused import" 2021-03-25 03:12:57 +00:00
Fan Zhang
770f8efe02 Merge "Button for opening app from Safety settings page" into sc-dev am: d2e71827cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984250

Change-Id: I54843f489932058cea2e7ee3d23067d37e581cdc
 2021-03-25 03:04:19 +00:00
Fan Zhang
d2e71827cf Merge "Button for opening app from Safety settings page" into sc-dev 2021-03-25 02:38:12 +00:00
Minche Li
3ddf67bdd8 Merge "Corrects the string for magnification dialog" into sc-dev am: ff6c9e231f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984246

Change-Id: I6855d2139a4b464354369a86167714ea15ffd3ab
 2021-03-25 02:36:44 +00:00
Minche Li
ff6c9e231f Merge "Corrects the string for magnification dialog" into sc-dev 2021-03-25 01:52:24 +00:00
Robin Lee
afcab7fe85 Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev am: d7b51a7b05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13974286

Change-Id: Ic3c1da7db4e8754599bc038d03a38d1d74208d3d
 2021-03-25 01:13:53 +00:00
Curtis Belmonte
6aaee7f89f Add new strings for face auth/enrollment 
Test: Build and install

Bug: 182806496
Bug: 183649070
Change-Id: I17efa5fee0babcece9c5fb2eb83e8cab4a575f2a
 2021-03-24 17:48:01 -07:00
Robin Lee
d7b51a7b05 Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev 2021-03-25 00:44:37 +00:00
Fan Zhang
a288358343 Button for opening app from Safety settings page 
Bug: 179063896
Test: Manual

Change-Id: I4cf627d630de277ebea3fe551d6799e5589e1af3
 2021-03-24 23:46:49 +00:00
Michael Wachenschwanz
ae599280bf Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev am: 448dac80de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959658

Change-Id: I600e07d8eb4b94f002e027dd017185cb2b4b22ff
 2021-03-24 20:55:46 +00:00
Kevin Han
4820b8c2e2 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev am: bad7c091d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986126

Change-Id: Id7d386997c7cd74471d86883ee4f49fb2275f10c
 2021-03-24 20:55:20 +00:00
Fan Zhang
79ce82b680 Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev am: c5242cbea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975105

Change-Id: I16a8ce919c51f294367fdbbfb52b8a081add7ce6
 2021-03-24 20:54:49 +00:00
Michael Wachenschwanz
448dac80de Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev 2021-03-24 20:46:34 +00:00
Kevin Han
bad7c091d6 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev 2021-03-24 20:37:03 +00:00
Fan Zhang
c5242cbea9 Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev 2021-03-24 20:36:41 +00:00
Shireesha Bongarala
af15313b34 Add strings for Safety & Emergency section 
Bug: 179063896
Test: make Settings

Change-Id: Ife43a597fa7262978e705fef96c783f109ff3f16
 2021-03-24 20:29:27 +00:00
Peter Wang
b2b4de78e3 [automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 am: 447fc31966 -s ours am: 67f7068065 -s ours 
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb is already in history

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

Change-Id: Ib7d9567a6bb648c3b39cdf57ff8451ea762eaac9
 2021-03-24 20:11:05 +00:00
Peter Wang
67f7068065 [automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 am: 447fc31966 -s ours 
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb is already in history

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

Change-Id: I125327931f43e3312cf5fb7173ba0f2929521044
 2021-03-24 19:56:23 +00:00
Sally Yuen
e194ce60ed Merge "Update Reduce Bright Colors preference string" into sc-dev am: 286247a9b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960429

Change-Id: I040000a15af7b17ef98cde8f61e1a57dab0a171e
 2021-03-24 19:51:46 +00:00
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
 2021-03-24 19:32:58 +00:00
Sally Yuen
286247a9b6 Merge "Update Reduce Bright Colors preference string" into sc-dev 2021-03-24 19:11:31 +00:00
Peter Wang
e74a04b3a8 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: Ia2dccf44b762bc5cf805f4c2aa3fea7f937c921c
 2021-03-24 18:56:56 +00:00
Ahaan Ugale
6f4f57c9e4 Merge "Autofill Settings: Display the number of saved passwords." into sc-dev am: a8df0386ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803855

Change-Id: I170523a39971a20209dcee06c9df78ff2c887b9d
 2021-03-24 18:55:28 +00:00
Ahaan Ugale
a8df0386ae Merge "Autofill Settings: Display the number of saved passwords." into sc-dev 2021-03-24 18:42:50 +00:00
Peter Wang
f8f7876c01 Removed unused import 
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
 2021-03-24 11:26:16 -07:00
Peter Wang
0b5532f67c Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2021-03-24 18:12:14 +00:00
Zhen Zhang
c86abd9b99 Fix HibernationSwitchPreferenceControllerTest 
Fix the HibernationSwitchPreferenceControllerTest

Test: this is the test
Bug: 183585589
Change-Id: If97f664596e2724b3435b88ed7f3ea8c3fa4df94
 2021-03-24 10:56:30 -07:00
sallyyuen
cd09b3a571 Update Reduce Bright Colors preference string 
Test: manual, atest ReduceBrightColorsPreferenceControllerTest
Bug: 182116724
Change-Id: Ifde343aad7c6931efd083a1c728a2504b74f089f
 2021-03-24 09:54:57 -07:00
Yanting Yang
fd82d8277b Merge "Add new summaries for homepage preferences" into sc-dev am: 1b82a33048 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981634

Change-Id: I5d25e366c2ac3bb9d06d11fe99874ea11519cf3f
 2021-03-24 15:24:22 +00:00
Jason Chang
c82076169f Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev am: aafe9ac0a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849832

Change-Id: I0c1b404c4f26ce235ccb584ab4ae3aba0b072cee
 2021-03-24 15:24:10 +00:00
Ahaan Ugale
373d2272ce Merge "Merge Autofill settings into Account settings." into sc-dev am: 7f3534925f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13958194

Change-Id: I1a06e10a8fa25ec1a9a8c6c6134f66a51772183e
 2021-03-24 15:23:35 +00:00