PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,414 Commits 1 Branch 0 Tags
ce080e6c66005d1360f47760b36d5b44fb1b027c
Commit Graph

81414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
475c9a8828 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: I3f46d6f36250708397d4eac01929ee84d97ac94d
 2021-03-25 04:46:35 +00:00
Sunny Shao
e59e83298c 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: If367a64c2ad916e20bd3846a54397bd29953da5b
 2021-03-25 04:45:47 +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
a3ca0b89c0 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: I6b50168ca0fdf370a97bdb8881224a8d115b6c19
 2021-03-25 04:07:49 +00:00
Jeremy Goldman
a0eca763c8 [automerger skipped] Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev am: c3723e22d5 -s ours 
am skip reason: skip tag Change-Id I94a881df13d1b35126de10f561d657136e4fed7f with SHA-1 7361f8557c is already in history

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

Change-Id: I517b3bf4c35b4b670557963a7cdea7996002e45f
 2021-03-25 04:06:21 +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
96ede67ef9 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: I39a3cca7bce2fd8a6de3df0a68bb8c34d8cddd3c
 2021-03-25 03:04:31 +00:00
Yu-Han Yang
109d9bb21d Update links to Scanning Settings 
Bug: 180533061
Test: on device
Change-Id: I103dbb999b408614c065763ec6c84952af18ddb3
 2021-03-24 19:53:14 -07: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
944e0921be 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: I391b5b59e767ebcc42475ef9a7998cef2ab2bbe3
 2021-03-25 02:35:33 +00:00
Yu-Han Yang
a286bad826 Untab Location Settings and tab Location Services 
Bug: 180533061
Test: on device
Change-Id: I1f096ffe1028dbf46816bbac5d514e3cb48d9e2c
 2021-03-24 19:17:35 -07:00
Minche Li
ff6c9e231f Merge "Corrects the string for magnification dialog" into sc-dev 2021-03-25 01:52:24 +00:00
Robin Lee
9e5b9d3658 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: I848c75edebbafb175a6e48cabef38ebfef6ea6e1
 2021-03-25 01:13:56 +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
Dmitri Plotnikov
e02d6efe85 Adjust consumed power for SystemBatteryConsumers 
The implementations of getConsumedPower() now consistently returns
the total power consumed, not the power unattributed to apps.

Bug: 183235836
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests

Change-Id: I9ea1592581b50d1533b00c28c9db4eab1e88edac
 2021-03-24 22:28:40 +00:00
Michael Wachenschwanz
11a462deb0 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: I526da2f6997b51902fc53dc6cb8fb2fbd4ea99d1
 2021-03-24 20:55:54 +00:00
Kevin Han
d2d32a8dc0 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev am: bad7c091d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986126

Change-Id: If6b6de316c761e30ffca47a8174bd4a93b563e38
 2021-03-24 20:55:30 +00:00
Fan Zhang
4686254012 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: Iafd2fd26e3550c839baee12198207b0f0aba9221
 2021-03-24 20:54:22 +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
c417dda04a [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: I3c9683c71a16ecf6ec206590b8058be09fab449e
 2021-03-24 20:10:43 +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
cbe24179ad 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: Ia963ff0d90637deac7bd0c2ca5b18794f0d1251d
 2021-03-24 19:51:47 +00:00
Soonil Nagarkar
2491d63996 Remove dynamic location settings footer 
Replace with static location settings footer.

Bug: 182210346
Test: manual
Change-Id: If3ab492418e5f3461f7b0123fc771ecdd56db6c9
 2021-03-24 12:43:03 -07: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
861a58ab89 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: I7e0be679fd52df2f3c5fd17779166521801b5a14
 2021-03-24 18:55:51 +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
d095f6265f 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: I982dd0ca996dd1ee562abd24b62b7ef88bff4c4e
 2021-03-24 15:44:52 +00:00
Yanting Yang
1b82a33048 Merge "Add new summaries for homepage preferences" into sc-dev 2021-03-24 15:21:39 +00:00
Jason Chang
d75463cb1e 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: I0c2c63ff60ccb4652801cbfd14ac4e17a579f701
 2021-03-24 15:20:16 +00:00
Ahaan Ugale
c5761363d5 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: I885977691d21e665af4d7b239778245eea507548
 2021-03-24 15:19:59 +00:00
Jason Chang
aafe9ac0a0 Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev 2021-03-24 15:15:52 +00:00