Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,208 Commits 1 Branch 0 Tags
2f49b652e4dd26c954aeade97015bada8ef8f6cc
Commit Graph

23080 Commits

Author SHA1 Message Date
TreeHugger Robot
932021a9a4 Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: Iab5b45764761bf0dad925a5d33757c8d7555fe0f
 2021-05-06 07:06:12 +00:00
TreeHugger Robot
dff47cf00a Merge "Fix loading ring overlapping problem" into sc-dev 2021-05-06 06:51:24 +00:00
TreeHugger Robot
c5b79e9b96 Merge "Update battery settings string" into sc-dev am: 1ae9a706ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: Ifaa38c49279153dc0926dc8b16203cb712703daf
 2021-05-06 06:13:26 +00:00
TreeHugger Robot
1ae9a706ff Merge "Update battery settings string" into sc-dev 2021-05-06 05:55:49 +00:00
Jason Hsu
eab02d8d91 Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: Ib891ceb04450baae0bc6ff9dc442f4ed6b2419f5
 2021-05-06 05:27:38 +00:00
Jason Hsu
8caef2218c Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev 2021-05-06 05:18:50 +00:00
TreeHugger Robot
b3de93529f Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: Icc0d974bc567e5027e079ef77ce4a68459c786d4
 2021-05-05 18:12:45 +00:00
TreeHugger Robot
5dbc9e8124 Merge "Add placeholder summary" into sc-dev 2021-05-05 17:47:18 +00:00
Tsung-Mao Fang
2042dac123 Fix loading ring overlapping problem 
By design, the loading ring is in the middle of the recycler view.
In the Android S, recyclerview isn't matched the screen's height.
So, if the recyclerview doesn't contains any item, the height could be
very low and then it causes to overlaps with drop down view.

The simple solution is to fix height of view of progress
bar, so it won't rely on the height of recycler view anymore.

Fix: 184643347
Test: Go to app notification page, and no overlapping problem.
Change-Id: I9f4fddba0254ac0cb0ba0b128a7dcc2de05d1fce
 2021-05-05 23:43:46 +08:00
TreeHugger Robot
0258cea266 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399

Change-Id: Ib034e1b7ad7b9b926a97f63d752ee5886fae016f
 2021-05-05 14:30:57 +00:00
TreeHugger Robot
ea1d3228b7 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev 2021-05-05 14:18:18 +00:00
Julia Reynolds
01ca4818b5 Add placeholder summary 
So the scren doesn't shift when the summary is added
asynchronously

Test: manual
Fixes: 183474692
Change-Id: I658191de1e53140b823e06a5f7959dc77e5a7fcb
 2021-05-05 10:13:46 -04:00
Wesley.CW Wang
7d0988f26d Update battery settings string 
Bug: 168635076
Bug: 183689347
Test: make SettingsRoboTests
Change-Id: I1650c1c391ec3444f53360cd0f87f226b988ea04
 2021-05-05 21:42:59 +08:00
Betty Chang
75b844f7bc Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397

Change-Id: Ifda73111d172a98944ac52b4455f6b82ab7c62e9
 2021-05-05 11:11:04 +00:00
Betty Chang
1637f3cd26 Merge "Add scrollView with config layout and button layout" into sc-dev 2021-05-05 10:39:13 +00:00
Tsung-Mao Fang
d3cd751f02 Apply dynamic color for Erase all data(factory reset screen 
Enable the dynamic color flag, and remove some unused theme in layout.

Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db
 2021-05-05 18:14:48 +08:00
changbetty
7c2090b870 Add scrollView with config layout and button layout 
Screenshot: https://photos.app.goo.gl/xmySTmdzbQeXksJC9

Bug: 186883458
Test: manaul test
Change-Id: I9c6855e95b032fbd71dce8399678521879363629
 2021-05-05 15:26:18 +08:00
Stanley Wang
172053b7bc Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600

Change-Id: I9691fe7ccb54a1a110b2f1871f3ea2b5236d2e41
 2021-05-05 03:38:23 +00:00
Arc Wang
d215628ceb Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668

Change-Id: I1250116e48ace44b73e5cf24dbc142664497d544
 2021-05-05 03:38:14 +00:00
Stanley Wang
9abe5df134 Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev 2021-05-05 03:19:26 +00:00
Arc Wang
3576b10330 Merge "Cleanup Storage Settings" into sc-dev 2021-05-05 03:13:37 +00:00
Kevin Chyn
61cfaed5fd Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: I9ac93a0e4f065c4ceaf1dd63f93b0d2db0496268
 2021-05-04 20:34:19 +00:00
Kevin Chyn
13720c397c Update credential removal strings am: a435a5a288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: I1a387cc1db0d571d789f9a88487c07b65b9c4fc9
 2021-05-04 20:34:18 +00:00
Kevin Chyn
177d76986a Merge changes from topic "credential-removal-strings" into sc-dev 
* changes:
  Update combined settings summary
  Update credential removal strings
 2021-05-04 20:13:00 +00:00
Wesley Wang
ce4941d236 Merge "Update battery help message layout" into sc-dev am: 0df7148f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: I967c0e444451d4c3ae48a425398b418b74c0b7c1
 2021-05-04 18:04:30 +00:00
Trevor Black
bcaf17b803 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I6096d1c857ffa6f628fcc1c19446b49a8d952137
 2021-05-04 18:04:18 +00:00
Wesley Wang
0df7148f1e Merge "Update battery help message layout" into sc-dev 2021-05-04 17:54:11 +00:00
Trevor Black
b6f2f39d27 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev 2021-05-04 17:38:26 +00:00
TreeHugger Robot
38cba6fe03 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I7f47c8ca8d8125fdffefc549653c121dba05f4df
 2021-05-04 14:40:22 +00:00
Arc Wang
e64f01ccfc Cleanup Storage Settings 
There is AOSP built in file browser for image/video/audio
file category, this change cleanup APP based category
for image/video/audio.

Bug: 183078080
Test: atest com.android.settings.deviceinfo
      atest com.android.settings.deviceinfo.storage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I925fc9296b8c2df5bd793668f66a12beb7744469
 2021-05-04 22:21:53 +08:00
Wesley.CW Wang
531e6b23a2 Update app usage page footer string 
- Use lower case string

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Id4111256bdab5f74e31fed6d015b96fe687a4c7b
 2021-05-04 21:13:25 +08:00
Wesley.CW Wang
3f98b5fb78 Update battery help message layout 
- Screenshot: https://screenshot.googleplex.com/6mdCCHYZBMNMdMG.png

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: Ie9bf2798ad733744c30278e98a75dd6c34c1a407
 2021-05-04 20:57:19 +08:00
Stanley Wang
9b906cb5b6 Use MainSwitchPreference on Bubbles, Screen Saver and 
One-Handed mode pages.

Fixes: 178679876
Fixes: 177968619
Test: robotest and see the UIs.
Change-Id: Ic62c7464a71e5410ece5d1db7578c522e1babedc
 2021-05-04 19:31:29 +08:00
Menghan Li
bd4fccc87c Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: I1c2fb1cc1b1d24528aea640d12b598f0bdeaf137
 2021-05-04 06:48:57 +00:00
Menghan Li
4ec4cf32f1 Merge "[Material Next] Typography for font style" into sc-dev 2021-05-04 06:22:58 +00:00
menghanli
39229a6aea [Material Next] Typography for font style 
Set fontFamily with Typography config which follows the rule for font
and supported font family changing in “Style & Wallpaper”.

Bug: 186065669
Test: Manual testing
Change-Id: I8b94a7e643fa72e91519209cbad2e3d65b6c6749
 2021-05-04 11:34:00 +08:00
TreeHugger Robot
8d0376c98c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-04 02:53:01 +00:00
TreeHugger Robot
7cc907da20 Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: I1df9196b3df5621361327123f7e9a8b24f22519a
 2021-05-04 02:49:13 +00:00
TreeHugger Robot
f2ec0fbf83 Merge "Remove Advanced item in Language & input Settings." into sc-dev 2021-05-04 01:39:38 +00:00
Bill Yi
ad14295e59 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4edba2d5bfab846fed936c170b758a26ef6cfc83
 2021-05-04 00:21:24 +00:00
Kevin Chyn
50dcf7955a Update combined settings summary 
Display strings based on number of enrollments

Bug: 185804815
Test: manual on-device
Change-Id: I47be2a53b37c36b3136cd233001db7cadf123ae9
 2021-05-03 16:15:56 -07:00
Kevin Chyn
a435a5a288 Update credential removal strings 
1) Credential can no longer be removed for separate challenge profiles,
   so strings and supporting logic are also now removed
2) Updates existing strings for credential and fingerprint
3) Adds new strings for face
4) Adds new strings for face + fingerprint

Bug: 185180691
Test: manual on device

Change-Id: I2a850eb6644103e14ef2a670222e500c705a16cd
 2021-05-03 16:15:55 -07:00
Trevor David Black
7c5484bc60 Update Android Settings for the latest Extra App Info design 
Bug: b/185793841
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: I2067f7d5d773e2fd9c817504dda262fb5fd7e033
 2021-05-03 19:05:15 +00:00
Edgar Wang
b0bfbe7fc5 Remove Advanced item in Language & input Settings. 
Fix: 186608859
Test: manual
Change-Id: I1dfa0aabaf6a9f2ba924cbf2bd190fc6b3e2741c
 2021-05-04 02:19:48 +08:00
TreeHugger Robot
38c31c7b4f Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Ieed21afd3445231702475a97fddc2083c67e55c8
 2021-05-03 14:04:05 +00:00
TreeHugger Robot
001dcc9e93 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev 2021-05-03 13:37:55 +00:00
Ryan Lin
bd365fdc7d Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: I99c3100057cb3365c0f4ffdd64d1ebd7afcf1670
 2021-05-03 11:28:55 +00:00
Menghan Li
cbc7db6025 Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604

Change-Id: Ic3ba3b9c0e770b7b28fc248c2cc278159c57bae1
 2021-05-03 11:28:47 +00:00
Ryan Lin
194015b774 Merge "Move Magnification Mode Settings to the main page" into sc-dev 2021-05-03 11:28:02 +00:00
Menghan Li
da60d4e842 Merge "[Material Next] Update accessibility tool footer style" into sc-dev 2021-05-03 11:13:28 +00:00