Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,529 Commits 1 Branch 0 Tags
3991ebebe21a14601435546228cbd73c90fff7e2
Commit Graph

22821 Commits

Author SHA1 Message Date
TreeHugger Robot
802222e5b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-14 17:16:08 +00:00
TreeHugger Robot
3a489538b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-14 16:14:39 +00:00
Bill Yi
e936ffc555 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie132293526ea7c325059ba78377c90abb373801b
 2021-04-14 14:52:51 +00:00
Bill Yi
96deb02d6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99b303e904c7b218f4dad1812a8ba83939a33f64
 2021-04-14 13:55:36 +00:00
Yanting Yang
62e5f40669 Merge "Use sentence case for display section subheaders" into sc-dev am: 2cfa6e5f39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182156

Change-Id: Id58cc24b2a11e378a46a14459ccab71762ffcfe0
 2021-04-14 11:10:56 +00:00
Yanting Yang
2cfa6e5f39 Merge "Use sentence case for display section subheaders" into sc-dev 2021-04-14 10:47:09 +00:00
Jeremy Goldman
27dc6600f6 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev am: 21eaa6d568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: I9e808af2bb149e7398087979d008aadc85d81deb
 2021-04-14 08:37:01 +00:00
Jeremy Goldman
21eaa6d568 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev 2021-04-14 07:49:18 +00:00
Yanting Yang
fa16844eb1 Use sentence case for display section subheaders 
Fixes: 184957718
Test: visual
Change-Id: Iba3cdda216d7bf4db4b124886b326a052117f6f4
 2021-04-14 06:34:58 +00:00
Ryan Lin
48fe9f7fc3 Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785

Change-Id: I56acfcea076055522048725dec665c1a6024e519
 2021-04-14 06:30:15 +00:00
Ryan Lin
0e35a6fe07 Merge "Show the illustration with the given button mode" into sc-dev 2021-04-14 05:50:49 +00:00
Jeremy Goldman
eecc97a339 Add additional strings to differentiate between single and multiple 
insecure vpns

Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.

Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
 2021-04-14 11:52:38 +08:00
Sally Yuen
3feaa92a95 Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431

Change-Id: I398050d0924d8a49f65177d5a91c2925678e63fc
 2021-04-13 17:13:00 +00:00
Sally Yuen
12166e5bb1 Merge "Add a banner for RBC/Extra Dim" into sc-dev 2021-04-13 16:18:57 +00:00
Weng Su
3af3569b92 Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev am: 96f73e20aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160589

Change-Id: I8ee98708c96ba296fbd74f666dc2830dcfec9a76
 2021-04-13 08:50:04 +00:00
ryanlwlin
2c5570e9fc Show the illustration with the given button mode 
Currently we support two modes of software shortcut.
We should change the illustration depending on the mode.

Bug: 185193333
Test: manually test
Change-Id: I54f800ead984c22cebec1de4ac15c022b0bcbb3d
 2021-04-13 16:21:41 +08:00
Weng Su
96f73e20aa Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev 2021-04-13 07:53:47 +00:00
TreeHugger Robot
c950d8af6b Merge "Integrate new version of MDC-android release" into sc-dev am: d8c11f5236 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13970091

Change-Id: Ibe2ff69557dc6e3039028ecbcac7d19bb8336e85
 2021-04-13 03:42:43 +00:00
TreeHugger Robot
d8c11f5236 Merge "Integrate new version of MDC-android release" into sc-dev 2021-04-13 03:14:49 +00:00
TreeHugger Robot
0760dda3b7 Merge "Update manage battery usage page string (1/2)" into sc-dev am: 94f4aeed44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160585

Change-Id: I156d34c246dd4f306dd7f0b4c05b6bf9655fd1a2
 2021-04-13 02:42:11 +00:00
TreeHugger Robot
64adfb888e Merge "Fix the backcolor problem in Display/Font size page" into sc-dev am: 3c8e922357 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14031887

Change-Id: I7bd40027ee310f30b284d605241deaa9a6cf6773
 2021-04-13 02:42:04 +00:00
TreeHugger Robot
a976cbecfd Merge "Update string" into sc-dev am: 086fb08d76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158848

Change-Id: Ia8bf769d08d5a9f7328bea9e460493bd7f75d240
 2021-04-13 02:41:28 +00:00
TreeHugger Robot
94f4aeed44 Merge "Update manage battery usage page string (1/2)" into sc-dev 2021-04-13 02:31:50 +00:00
TreeHugger Robot
3c8e922357 Merge "Fix the backcolor problem in Display/Font size page" into sc-dev 2021-04-13 02:23:00 +00:00
Weng Su
6884d63824 [Provider Model] Move down the Internet unavailable Wi-Fi 
- Move down the Internet unavailable Wi-Fi to the top of the available
Wi-Fi networks

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/94NotfJLKXSbBW9

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I1c98e2a8793ce9dc2fb886c0fa66f4297a34ab01
 2021-04-13 10:04:33 +08:00
TreeHugger Robot
086fb08d76 Merge "Update string" into sc-dev 2021-04-13 01:59:35 +00:00
sallyyuen
fbdb01dc87 Add a banner for RBC/Extra Dim 
Screenshot: https://screenshot.googleplex.com/5kumq7ruwCzd6vC.png

Test: Manual
Bug: 170973645
Change-Id: Iea9d90ded5fc393b78e724ec10bc83ff7295965c
 2021-04-13 01:07:26 +00:00
Chloris Kuo
fb8b6198c2 Merge "NAS Setting Migration" into sc-dev am: ccd2bfc1a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13923001

Change-Id: I20634338c39397650e75f7c069f396454d4d536b
 2021-04-12 17:43:18 +00:00
Chloris Kuo
ccd2bfc1a0 Merge "NAS Setting Migration" into sc-dev 2021-04-12 17:16:50 +00:00
TreeHugger Robot
f724367ed9 Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev am: 588e4e8d8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111144

Change-Id: If11715a4183ab2d5d105861037b63d0d11d5901a
 2021-04-12 14:04:31 +00:00
TreeHugger Robot
588e4e8d8b Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev 2021-04-12 13:30:30 +00:00
Wesley.CW Wang
e9a0d50e99 Update manage battery usage page string (1/2) 
Bug: 183689347
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ib24b74c8c38ef28520deed043a4b1841b8a50803
 2021-04-12 12:58:20 +00:00
TreeHugger Robot
76d6f894bc Merge "Fix gender issue on subtext of screen pinning" into sc-dev am: 2216765159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158858

Change-Id: Iffc73845dc84b248b8d8d46284e19e29441912d6
 2021-04-12 09:54:23 +00:00
TreeHugger Robot
2216765159 Merge "Fix gender issue on subtext of screen pinning" into sc-dev 2021-04-12 09:48:40 +00:00
Tsung-Mao Fang
304c68a836 Fix gender issue on subtext of screen pinning 
Create a new string id so that localization team can fix it
individually.

Test: Rebuilt rom and see correct subtext
Fix: 184748174
Change-Id: I3ab644950ee8211c89199446b92e759a5efa4527
 2021-04-12 16:28:03 +08:00
Hugh Chen
38fc9a91b5 Update string 
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
 2021-04-12 14:57:33 +08:00
Jeremy Goldman
8371ee713d Update string for editing an insecure VPN. 
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216
Bug: 184921649

Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
Merged-In: I76257a4a2c2b9d5a49248296676d98980be9d77c
(cherry picked from commit ec4b612932)
 2021-04-12 06:21:27 +00:00
Chloris Kuo
2c955bbae2 NAS Setting Migration 
Change NAS setting to a toggle setting and move the settings to
Notifications/General

Bug: 173106358
Test: tested manually on device, make RunSettingsRoboTests
Change-Id: I1ba1214511dceea6faf5fb39692d920e761b33d8
 2021-04-10 18:22:44 -07:00
Wesley.CW Wang
f75feb6ee5 Refine battery settings layout am: f1ca264f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14139746

Change-Id: I4468c1dc24f6df57aafc2bf524db64d7af0a4e07
 2021-04-10 18:35:26 +00:00
Wesley.CW Wang
f1ca264f69 Refine battery settings layout 
- Add loading text to progress bar to prevent UI flaky
 - Setup enable/disable state for battery saver switch
 - Remove battery saver page divider

Bug: 177964551
Bug: 177964753
Bug: 184626649
Test: make SettingsRoboTests, visually
Change-Id: I8e05c0c0f02710729e1f59eff23fb3f425770de9
 2021-04-10 17:39:14 +00:00
Abel Tesfaye
9435e52d3f Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev am: 473fffa318 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989325

Change-Id: I534663b249ccb4cda1b32918b1c68feb275458d3
 2021-04-09 17:10:41 +00:00
Abel Tesfaye
473fffa318 Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev 2021-04-09 16:31:36 +00:00
Rubin Xu
a80a234f4f Merge "Update titles & messages for password enrolment flows" into sc-dev am: 2f03bda6a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018665

Change-Id: Id0902a7dd72a3c3a9f3b8932459ee9f22cfd46e3
 2021-04-09 15:19:09 +00:00
Rubin Xu
1ac05237ab Update titles & messages for password enrolment flows 
Show different titles and description messages when
enrolling password under various conditions:
* personal lock verus work lock
* adding a new lock versus updating existing lock
* enrolling a PIN verus password versus pattern

Add icons to options in screen lock picker.

Add an option to redirect to work lock flow if the admin
has set device-wide password requirement.

Bug: 183922696
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I40417b113814659d3226a44eb7f9d553386e3c58
 2021-04-09 14:35:36 +01:00
Wesley Wang
fecca0ec3f Merge "Support help message when battery is unavailable(1/2)" into sc-dev am: 57f27f7a30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124308

Change-Id: I7b4da94c19efcf4b5af8a838adbb05865dc330e1
 2021-04-09 05:12:34 +00:00
Wesley Wang
57f27f7a30 Merge "Support help message when battery is unavailable(1/2)" into sc-dev 2021-04-09 04:43:06 +00:00
TreeHugger Robot
17fd36fad8 Merge "Add icons to Manage location services and App location permissions" into sc-dev am: 036a0c8877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14102791

Change-Id: Icbe53a7480f706e95968d3fdda4de9e8a67015bd
 2021-04-09 04:05:14 +00:00
TreeHugger Robot
036a0c8877 Merge "Add icons to Manage location services and App location permissions" into sc-dev 2021-04-09 03:51:39 +00:00
Wesley.CW Wang
756028aadd Support help message when battery is unavailable(1/2) 
- Present help preference when battery is unavailable

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
 2021-04-09 11:24:51 +08:00
Fan Zhang
7cf1d1d22c Merge "Update emergency gesture settings string" into sc-dev am: b6e8a1ca22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128298

Change-Id: I25b1e9c99fc5f63d8e35e430f9d28880069da19f
 2021-04-09 00:37:33 +00:00