Commit Graph

82871 Commits

Author SHA1 Message Date
TreeHugger Robot
8c4a1e129a Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: I82055f3fba3ba7101a3c51a1f5feba4db153bb1b
2021-06-10 08:00:59 +00:00
TreeHugger Robot
970e76fd59 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev 2021-06-10 07:47:29 +00:00
TreeHugger Robot
f33d9d4b39 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I5a3b240ac57a0e507acfd8a57955bcca87be63fb
2021-06-10 07:37:47 +00:00
TreeHugger Robot
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00:00
TreeHugger Robot
555fb90e50 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I14c94ab95a3f6148900c9858a759789efef117d5
2021-06-10 05:41:00 +00:00
TreeHugger Robot
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +00:00
Tom Hsu
96c1ff8d06 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: Ib263e0b74e2b5708c7723f6bc8498e2c9dd712e5
2021-06-10 04:11:52 +00:00
Tom Hsu
b235d51559 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I06726069d5e99e2b4870c32d17718df0819cfb47
2021-06-10 04:11:38 +00:00
Tom Hsu
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +00:00
Tom Hsu
8974f99365 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev 2021-06-10 03:58:00 +00:00
Tsung-Mao Fang
cbf5ccab0e Fix shifting problem in location services page
Controller generates the injection location settings
in updateState() which happens in onResume.
That's the primary reason why we observed the shifting issue.

In a good practice, we generate preference in displayPreference(),
and then update the setting state in updateState().

In this cl, we create a base controller class to encapsulate
most implementation, and developer need to inject location
services in child class.

Test: Add work profile, and see correct services list.
Bug: 183169265
Change-Id: I5735ba974da87ad83b56791abd8a8637c2317571
2021-06-10 11:26:23 +08:00
TreeHugger Robot
f6d3b406b4 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I29eb0e6131cb2d861b29f1f48ef749f727ef26b6
2021-06-10 02:02:16 +00:00
TreeHugger Robot
0a111093bd Merge "Adjust size/position of face education illustrations" into sc-dev 2021-06-10 01:38:21 +00:00
Curtis Belmonte
2f2acef17a Adjust size/position of face education illustrations
Increase the size of the Lottie animation and adjust the margins of both
illustrations shown on the Face Unlock enrollment education screen.

Test: Start face enroll, press accessibility button on education screen

Fixes: 189725079
Change-Id: I40fc174c2ae574ed1a2919e8fab8a62ce90c8d0e
2021-06-09 17:31:56 -07:00
Curtis Belmonte
4f9906769e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I487a6d0dd1bdfb331c765b2e75b8d784bbc22e79
2021-06-09 21:52:51 +00:00
Curtis Belmonte
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +00:00
Joshua Mccloskey
115302057b Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I59c751047daa2028b1c6baaf2a2f9260e3d58e3d
2021-06-09 20:31:58 +00:00
Joshua Mccloskey
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
9f76510d0f Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I1a08bc2ecf340a8a5dfe906bf19a7b35a6308587
2021-06-09 19:36:14 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
c0e361ba79 Merge "Update method name" into sc-dev am: a2c2889c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iaedb06a7d862f708af1ba1139f17a648d74ace4e
2021-06-09 18:02:33 +00:00
Curtis Belmonte
f097ad4100 Remove intro text from Face Unlock Settings screen
Removes the intro text from the top of the Face Unlock Settings screen,
since it is now redundant with the help text shown in the footer of this
screen.

Test: Open Face Unlock Settings, ensure intro text is gone

Fixes: 190622232
Change-Id: Ie7880a2e5b1405bf1298e3b9160b7d534fabd1c2
2021-06-09 10:59:06 -07:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
5ccaa61a2f Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I181cc7e6385a87f40d8632db84e98f4e9b279206
2021-06-09 17:04:12 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
2021-06-09 16:45:54 +00:00
Sunny Shao
20efc0ce3e Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5bb8d0590937d8544cc0eaf50705314d4bfdad07
2021-06-09 15:41:23 +00:00
Julia Reynolds
b70d3d5c13 Update method name
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
2021-06-09 09:53:09 -04:00
Sunny Shao
d769667e09 Fix button is not fully rounded corner issue
Fixes: 189903078
Test: manual test
Change-Id: I498e2a9050255801c8c2613c4a933d8a713a0d55
2021-06-09 21:42:06 +08:00
Yi-Ling Chuang
aba4103920 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I13353feb811de25053023358d955db1eff957bf5
2021-06-09 13:19:12 +00:00
Yi-Ling Chuang
562ad29721 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev 2021-06-09 13:06:59 +00:00
Zoey Chen
5047a5d041 Merge "[Settings] Fix test failure of WFC group" into sc-dev am: 38b22563f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912500

Change-Id: I7f407bf133d33034cf936319e989043c9086490a
2021-06-09 11:56:43 +00:00
YUKAI HUNG
bf203b18e5 Merge "Resolve locale not update issues in the chart view" into sc-dev am: 4248531508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912493

Change-Id: I7ada919a6e9d6eeea477858e1d71a4323ede1966
2021-06-09 11:56:29 +00:00
Tsung-Mao Fang
27927f3cb7 Apply android accent color
We should add android accent color to get the correct color.

Test: Icons show up in screen lock page. And see correct color in SUW
flow.
Fix: 190582618

Change-Id: I0d1062288228772fa2ea45103512c8e46793ae9d
2021-06-09 19:51:15 +08:00
Zoey Chen
38b22563f8 Merge "[Settings] Fix test failure of WFC group" into sc-dev 2021-06-09 11:43:47 +00:00
YUKAI HUNG
4248531508 Merge "Resolve locale not update issues in the chart view" into sc-dev 2021-06-09 11:43:41 +00:00
PETER LIANG
575ae9574e Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310

Change-Id: I76e0436b02f078a750562f434bb28e3f81644644
2021-06-09 11:01:22 +00:00
PETER LIANG
d2c4944cbb Merge changes I99fb2ed2,Iba18bfab into sc-dev
* changes:
  Support the lottie image file for the banner in Accessibility Settings.
  Fixing the animation of drawable couldn't play automatically for the banner.
2021-06-09 10:44:10 +00:00
Weng Su
bd31f36a2e Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev am: 635e57bd4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891919

Change-Id: Icd43216660f67f288f8515e5ce29d13294074d9f
2021-06-09 10:26:22 +00:00
Peter_Liang
3ce3a93e71 Support the lottie image file for the banner in Accessibility Settings.
Action:
Currently, the ImageView component couldn’t handle the lottie image from raw resource folder,  so temporarily using the LottieAnimationView from settingsLib to support lottie image for the banner of Accessibility settings.

Bug: 186065724
Bug: 179451422
Test: atest AnimatedImagePreferenceTest
Change-Id: I99fb2ed26085c73bc262c58001de8dec3078e1d0
2021-06-09 10:11:23 +00:00
Weng Su
635e57bd4e Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev 2021-06-09 10:05:51 +00:00
Mill Chen
bbb527ac0d Merge "Update the theme to fix background color problem" into sc-dev am: 6a1ff49cb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878872

Change-Id: Ie6ffda2ab0d98acea7e4431b41b15052cc008090
2021-06-09 09:48:16 +00:00
Arc Wang
bdb70b1078 Tweak UI of CardPreference and ContextualCard
- CardPreference uses settingslib_preference
  layout to fix title/summary alignment issue.

- Remove stroke for CardPreference and ContextualCard.

- Set colorSurface as default card background color.

Bug: 188599776
Test: manual visual
Change-Id: Id0ee40be60de1f7605849490ee43eae4b9420abb
2021-06-09 17:43:43 +08:00
Mill Chen
6a1ff49cb7 Merge "Update the theme to fix background color problem" into sc-dev 2021-06-09 09:36:04 +00:00
Arc Wang
7b85f2af24 'Free up space' uses CardPreference
For material next style.

Bug: 188599776
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CardPreferenceTest
Change-Id: Ibaf4d11ab44017453498676db00cff1e49c83b9d
2021-06-09 17:35:33 +08:00
Tsung-Mao Fang
0ae249e8c7 Fix broken tests for main clear pages
After ag/14438399, a lot of related tests failed.
Create two overlay layout files in robolectric and add original theme
style back.

It's not perfect, but it didn't affect the behavior of tests,
Tests still can build the views and do the original tests.

Test: Run robo test
Fix: 187819138
Change-Id: I7af0e9e6c61fc204efeea03ec3ca8437aeb2d256
2021-06-09 17:08:07 +08:00
Zoey Chen
ff0c06f20a [Settings] Fix test failure of WFC group
Bug: 190569916
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: Ie520f3709eb0751150fdbda1f14e878ba21e22c4
2021-06-09 09:07:50 +00:00
ykhung
2a75186e4b Resolve locale not update issues in the chart view
- read locale from configuration rather than Locale.getDefault
- refine 12-24 format to align the current status bar short style
- resolve locale change not update chart percentage label
- extend timestamp label in the chart graph from 4 to 5 labels

Bug: 190150515
Bug: 190422902
Bug: 190226837
Test: make SettingsRoboTests
Change-Id: I5347964900123a6d112dbc37c2af87eb7d73f1d2
2021-06-09 16:11:15 +08:00
tom hsu
4f3ac2fcbd [Settings] Resolves unsynced infomation between status bar and settings
When activity go to background, the UI message shall be saved, and When
 activity is back to foreground, the UI shows previous state first.
 The situation make unsynced info between status bar and settings's
 page.

Bug: 187091965
Test: Maunal Test
Test: atest passed
Change-Id: I7db2876e91c00126ebfa9dfa5b87d04c1f717e72
2021-06-09 15:19:48 +08:00
Stanley Wang
d7875ab8a8 Merge "Fix the problem of the TalkBack function can not be turned on." into sc-dev am: bbab97c955
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891917

Change-Id: I3804164b0b78e26baecca0ae62294f77b109c636
2021-06-09 06:49:39 +00:00
Stanley Wang
bbab97c955 Merge "Fix the problem of the TalkBack function can not be turned on." into sc-dev 2021-06-09 06:37:29 +00:00