Commit Graph

83714 Commits

Author SHA1 Message Date
Alex Johnston
e8dfc62cf8 Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: Ifa4898b59a7ea03ca15b2f907b244601fa10552a
2021-06-10 09:50:26 +00:00
Alex Johnston
e2f5b87c14 Merge "Credential management app UI tweaks" into sc-dev 2021-06-10 09:38:15 +00:00
Kholoud Mohamed
1f9329d010 Merge "Fix failing tests" into sc-dev am: 4ee8d6de71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I8e78a640a4f9065e00cedbf232eecac382826b98
2021-06-10 09:12:16 +00:00
Kholoud Mohamed
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +00:00
TreeHugger Robot
c41f57cbb3 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: I40fcc116efb96e73e073b8c91da00ad607fc5aa3
2021-06-10 08:01:03 +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
4868bf6f2e 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: I20404eb83bd688e02a55248fe6f93014debdc4f5
2021-06-10 07:37:49 +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
86233cd3ac 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: Iced7c1320df29efb6250132387a8113677642a22
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
979e486314 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: I66294bfca255d77f12c1641f0c0e8f94bf57ea9c
2021-06-10 04:11:46 +00:00
Tom Hsu
ed18d645e2 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: I3ff4eafdf43f7b1249e3399d9438c5c1f35d7725
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
30e11c2f89 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: I113854092937696e63036aa5ec6dd96496977807
2021-06-10 02:02:21 +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
1bffc18b68 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: Ieffec4b19d6c6eb6a445c1a112857edb2f6c96d0
2021-06-09 21:53:08 +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
2e96fea0eb 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: I7310802572b207122908b7ea3bf50dbf9eeac226
2021-06-09 20:32:17 +00:00
Joshua Mccloskey
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
7ab25d56d5 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: I25bcb42f5346a4d758381b3482ac11a37419d7af
2021-06-09 19:29:13 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
77b60fb6c3 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: I4cff8e8f8043befdbd3b914aa4e2a9ee87f957ca
2021-06-09 18:02:47 +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
0dc2fde11e 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: I33f42583bbc28eec283d15a3a261cf8f922ce6fe
2021-06-09 17:05:03 +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
32457e20c6 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: I3685f2bfb340da40478e0cb4ceccdcc9cf664ba7
2021-06-09 15:41:38 +00:00
kholoud mohamed
be0a96bd23 Fix failing tests
Fixed failing tests in InteractAcrossProfilesDetailsTest and removed
unused code in InteractAcrossProfilesSettingsTest.

Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettingsTest
Fixes: 190186823
Change-Id: I52c498b9eb9c09401548e557770cd6434de49a2c
2021-06-09 14:11:56 +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
8adbf695e9 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: I38645c38067c703c1cffeeaa437136dba3d974a5
2021-06-09 13:20:37 +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
3cf088904c 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: Ie0acd760d863ded36f4b8eb5a82c2ff272d25f0d
2021-06-09 11:56:53 +00:00
YUKAI HUNG
3cc2a79f44 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: I9cecc83ff79efafb4f3a2e22fe1fb0c0b59f0975
2021-06-09 11:56:45 +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
150dd5fa0a 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: I65cb326af147f083320fc09a21f851c9e2d6830f
2021-06-09 11:01:20 +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
c390be0a48 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: I5677e9080696bcfe3f8c34281681f940ba386fb1
2021-06-09 10:26:10 +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
b190fd9825 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: Ia53917f4d749ce6bda9be95c3a9f954b97f561c7
2021-06-09 09:48:22 +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
Alex Johnston
7db8142435 Credential management app UI tweaks
Credential management app Settings screen
* Add uninstall certificates button
* Reformat summary
* Remove dividing lines
Request manage credentials screen
* Make requesting app name bold

Manual testing
* Install TestDPC and select 'Request to
  manage credentials'
* Verify app name is bold and select allow
* Install a certificate as the cred mng app
  via TestDPC
* Go to Setting > Security > Encryption
  & Credentials > Credential Management App
* Verify screen looks like mocks
* Select 'Remove certificates' and
  verify all certificates installed by the
  cred mng app are removed
Settings screen: https://screenshot.googleplex.com/C6n9bnwkw843jgf
Request screen: https://screenshot.googleplex.com/5qH44NXKKGRsdHs

Bug: 189416800
Test: manual testing
      CredentialManagementAppControllerTest
      CredentialManagementAppFragmentTest
      CredentialManagementAppButtonsControllerTest
      CredentialManagementAppHeaderControllerTest
      RequestManageCredentialsTest
Change-Id: I71334b231ae7cefbc055e2575eda5418da2548b4
2021-06-09 10:13:53 +01:00