Commit Graph

23132 Commits

Author SHA1 Message Date
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
58318ccb5f 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: If2c4ed2f1516aaed5317c0042fdb24f169aafde2
2021-05-05 11:09:46 +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
f41ba6124a 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: Ie0124aac157e8349f9868a5958e1d6a7fc135eb3
2021-05-05 03:38:15 +00:00
Arc Wang
a298a39a2a 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: I6c3311651e5d3e7edb58d2b3d55eb54b46845a3e
2021-05-05 03:38:03 +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
4431af41b9 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: I0e450163da3cc9557fc858ce9ed14d8d12e75ddb
2021-05-04 20:33:34 +00:00
Kevin Chyn
39f85272a6 Update credential removal strings am: a435a5a288
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: I945256349d2e84f43b49342eb9ef516c5b4966ae
2021-05-04 20:33:33 +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
60983ec7ba 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: I7528851174559ee89540b5dfe9b58e68669211d8
2021-05-04 18:08:20 +00:00
Trevor Black
933819c4eb 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: I4be5f8b55ea7648cbc936a2a65772b428a871b39
2021-05-04 18:08:01 +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
bccec996c0 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: I4e4ed9b21ac4fbb0eeadedcbebac479fc4fd810f
2021-05-04 14:39:50 +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
Hugh Chen
139ff59346 Fix the section below "Pair new device" moves up a few pixels
This CL add new controller that used to show the summary when
bluetooth is off. It can prevent a jank since the UI is decided
before render.

Bug: 182232469
Test: make RunSettingsRoboTests -j56
Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
2021-05-04 20:45:41 +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
f47694d4c5 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: Iaed0ce71c0f3b563a6dda3b28e03d93af4e76a73
2021-05-04 06:48:39 +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
dbe3c72bb6 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: Ibbdbf407b847dce578035104fbf5fda83cbd8312
2021-05-04 02:48:46 +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
21f81feb86 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: I874e9c98a7ea1dda231c1bc0aee01a0033ffd8ec
2021-05-03 14:01:02 +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
9d46a4fec6 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: I227793e9d91307a221ec6e307ced5acfd4321e8f
2021-05-03 11:34:32 +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
484782bc2e 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: Ia0eeba70077a8d12507e99355b6d3ecbaf1368a4
2021-05-03 11:26:16 +00:00
Menghan Li
da60d4e842 Merge "[Material Next] Update accessibility tool footer style" into sc-dev 2021-05-03 11:13:28 +00:00
Menghan Li
055eed3d94 Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958

Change-Id: Ib468520dfd7c8f8957d24ce8e24393acf7dc40fe
2021-05-03 10:21:52 +00:00
TreeHugger Robot
cdceaf3602 Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960

Change-Id: Ica83b61c65571466e2f8e444568e3b0d73c9aae4
2021-05-03 10:21:39 +00:00
Menghan Li
8270d175b8 Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev 2021-05-03 10:21:29 +00:00
TreeHugger Robot
c3dc96ebc3 Merge "Revert "Refine battery help message layout"" into sc-dev 2021-05-03 10:07:11 +00:00
Edgar Wang
37c15a371c Remove reserved icon space for Safety > Wireless emergency alerts
- remove iconSpaceReserved = true

Bug: 186609856
Test: visual
Change-Id: Ib6145e94e7a4f199b17e2e7f3b4c180b60e98900
2021-05-03 17:50:24 +08:00
Mill Chen
71c15d3f18 Increasing the character limit am: b4a9916adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673

Change-Id: Ib423a3d96b860b669482bef7a4581707eac19f14
2021-05-03 09:08:24 +00:00
Mill Chen
a51dd978ee Revert "Refine battery help message layout"
This reverts commit 2369167d63.

Reason for revert: break Settings checking style

Bug: 187023021
Change-Id: I4bb0f93e5d2a545af5e6004dfe24c7e87738036c
2021-05-03 09:06:08 +00:00
menghanli
503eac982b [Material Next] Audio adjustment customized seekbar
1. Seekbar high: 48dp for the tappable area
2. Left aligned

Bug: 186609598
Test: Manual testing
Change-Id: I3546e3f39abe04480ca00d8068ff92a5546645ab
2021-05-03 08:48:00 +00:00
Mill Chen
b4a9916adf Increasing the character limit
We need to extend the character limit for some strings related to
biometric settings, since it's too short to block the translating work.

Fixes: 186427209
Test: build and verified
Change-Id: I201276c7c9120cdbfcda6fd23f3d6f8a3e03d116
2021-05-03 15:33:24 +08:00
jasonwshsu
91c14e8c6a Align dark theme in accessibility page with the dark theme in display page.
Root Cause: Two different behaved dark theme exist in different page

Solution: Align with the dark theme in display page

Bug: 185880142
Test: manual test
Change-Id: If905c1e3e067377a835223d5d5eb2ca426673e49
2021-05-03 15:00:56 +08:00
TreeHugger Robot
dc9beae9ec Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656

Change-Id: I6e9e979088391e46904d599898b5d70ab8e2024f
2021-05-03 04:09:34 +00:00