Commit Graph

368 Commits

Author SHA1 Message Date
Edgar Wang
aeb2c1d8fa Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev 2021-06-10 12:56:21 +00:00
Alex Johnston
cf5bb13576 Merge "RequestManageCredentials Material Next Spec" into sc-dev 2021-06-10 09:38:35 +00:00
Alex Johnston
17101d6ebe Merge "RequestManageCredentials landscape mode" into sc-dev 2021-06-10 09:38:29 +00:00
Alex Johnston
e2f5b87c14 Merge "Credential management app UI tweaks" into sc-dev 2021-06-10 09:38:15 +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
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
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
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
Alex Johnston
848a388a71 RequestManageCredentials Material Next Spec
* Update buttons to have rounded corners
  and more padding
* Update text colour of buttons
* Update floating action button background
  and text colour

Manual Testing via TestDPC
* Light mode https://screenshot.googleplex.com/8MxZZjftRFMXJhM
* Dark mode https://screenshot.googleplex.com/3vgWrEJnCbzUdhh
* Floating action button https://screenshot.googleplex.com/5H4nfTWz7sNJJmT
* Landscape

Bug: 189193577
Test: Manual testing
       RequestManageCredentialsTest
Change-Id: Iba8b4b6af655abfdab6216e6042ee222c3f745dd
2021-06-09 08:09:54 +00:00
Alex Johnston
4ef1438512 RequestManageCredentials landscape mode
* Split screen into two halves, where the left
  side includes the title and the right side
  includes the recycler view, floating action
  button and action buttons.
* https://screenshot.googleplex.com/6Co6kn2DyXZRGNZ
* https://screenshot.googleplex.com/6uwHAGuRHjNcStN

Bug: 189193577
Test: manual testing via TestDPC
      RequestManageCredentialsTest
Change-Id: I9c82a7471c885658aacb40b22166ec801e2833ca
2021-06-09 09:06:49 +01:00
Edgar Wang
a0a7ff6d76 Moving progressBarHorizontalStyle to SettingsLib
Bug: 190467533
Test: rebuild & manual
Change-Id: I5f7f493b7c100c06ff5328706906bf33bae34e56
2021-06-09 04:23:13 +00:00
Kevin Chyn
ade59af392 Update fingerprint/face enrollment to lock icon
Bug: 187460696
Test: manual
Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6
2021-06-04 12:49:31 -07:00
Jason Chiu
263d1e2c82 Revise homepage colors
- Increase the contrast ratio of the search bar
- Adjust the color of IA icons

Test: visual
Fixes: 179632631
Change-Id: I9b4fc4d671183929d4b2fed27cba8600d56cc74c
2021-06-02 13:24:33 +00:00
TreeHugger Robot
677e59cbef Merge "Relayout Reset Wifi page" into sc-dev 2021-05-31 03:28:10 +00:00
Edgar Wang
88600e7916 Relayout Reset Wifi page
- Update textAppearance
- Adjust padding
- Update Button style

Fixes: 189389538
Test: visual verify
Change-Id: I03fe9368c0f3140990f96b6418034e14cb7ce813
2021-05-28 18:27:37 +08:00
menghanli
02200d29af Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo
Root cause: Use marginRight between icon and text, but it does not work for RTL launguage.
Solution: Use margineEnd instead.

Bug: 189221008
Test: Manual testing
Change-Id: I02d30228c80c95aeb3b875364f2d2cbf76f3664b
2021-05-27 20:31:58 +00:00
Edgar Wang
de88f5244c Update Policy transparency dialog to new style
- Tweak layout
- Update app icon
- Update font Size

Bug: 188756125
Test: manual
Change-Id: I7ddd73c80ead95d57202d1753408b437611a76b4
2021-05-22 04:00:38 +08:00
Arc Wang
cb1574319b Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev 2021-05-20 06:27:18 +00:00
Arc Wang
4a2acd2e20 Fix UnsupportedOperationException in Display Settings
Remove android:textColorHint from Theme.Settings to fix the regression.

This is a quick fix, each EditText should set its hintTextColor
attribute before there is a fix to apply the attribute globally in
Settings APP.

Bug: 188405076
Test: manually launch 'Font size' and 'Display size'.
Change-Id: If3313be47e0c3e8ce9d41a6e87cdf2e7067ce54b
2021-05-20 01:01:21 +00:00
TreeHugger Robot
a07eb69948 Merge "Fix the text contrast for biometric header" into sc-dev 2021-05-19 03:17:48 +00:00
Mill Chen
39c512f9aa Fix the text contrast for biometric header
Since the color of text was using material dark color from material
theme, which is different from the one in Settings. Removing the text
color specified in the style can fix this problem.

Fix: 182437787
Fix: 187145158
Test: visual verified
Change-Id: I4ad5004a6811713982d0d22a8050889d75cc3a5f
2021-05-18 11:46:15 +08:00
Arc Wang
c0d31a80d3 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev 2021-05-14 12:59:11 +00:00
Arc Wang
b61388d1f5 Fix hint text color contrast problem in LocalePickerWithRegionActivity
Set android:textColorHint textColorSecondary in Theme.Settings.

Bug: 147637981
Test: accessibility scanner
Change-Id: Ie3ef7e86909b75366c427ac5c6a90a9a02f0f660
2021-05-14 16:34:39 +08:00
Jason Chiu
7d9dceadb7 Redesign homepage IA icon
- remove the outer circle of the icons
- tint the icons including injected ones

Test: robotest, visual
Bug: 182870640
Change-Id: If72c37152f4f0d68e25149b11d497eef1c7ece91
2021-05-12 08:37:37 +00:00
Tsung-Mao Fang
55ab3f91e5 Fix color contrast problem for VPN page
Test: A11y scanner doesn't show text contrast problem
Fix: 187399519
Fix: 181185518
Change-Id: I830a8b16d817bbdf2c68332e38fad0a15b87ce45
2021-05-10 09:54:12 +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
ryanlwlin
6269a92e16 Move Magnification Mode Settings to the main page
We move the mode settings because currently there is
only one item in the settings page. To fully test all logic,
we don't use fragament anymore in the controllerTest, and
test the interaction between the controller and the fragment
in the test of these two fragments.

Bug: 182992338
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
      atest MagnificationModePreferenceControllerTest
      atest MagnificationSettingsFragmentTest
      manually test
Change-Id: Ia6b0ea4f116f3215407637d7aeaddb8d8196d8fb
2021-04-29 20:12:35 +08:00
TreeHugger Robot
ea2a359561 Merge "Update the style for collapsing toolbar" into sc-dev 2021-04-22 06:40:23 +00:00
Arc Wang
3486b95fd7 Merge "Update progress bar UI" into sc-dev 2021-04-21 09:01:35 +00:00
Alex Johnston
4a4e2bae61 Merge "RequestManageCredentials dark theme" into sc-dev 2021-04-21 08:45:06 +00:00
Alex Johnston
dce68bf7a5 RequestManageCredentials dark theme
Manual testing steps
* Enable dark theme via Settings > display
* Install TestDPC and select 'Request to manage credentials'
* Verify dark theme is displayed (including light text)

Bug: 177901172
Test: atest com.android.settings.security.RequestManageCredentialsTest
      manual testing
Change-Id: I6db1361ffcbf1e193673eb5ca7ef3f403d5023b1
2021-04-20 15:21:14 +00:00
Arc Wang
5383f11ec9 Update progress bar UI
Apply android:progressDrawable to Settings theme,
the drawable shows round corners and different colors.

Bug: 174964885
Test: manual visual
Change-Id: I0447231200d12953f4527866d537ee605009f8a4
2021-04-20 20:31:30 +08:00
Mill Chen
86fd923d6f Update the style for collapsing toolbar
The new version of collapsing toolbar has been updated and it needs
the edge-to-edge configruation to work smoothly. Added the configuration
for Notification history and removed useless styles.

This change is also trying to reuse the layout that is from SettingsLib
and remove the one from Settings.

Bug: 183496853
Test: visual verified
Change-Id: Iecfb96fe5ead91b0421050c3dfc1c1ab456aafff
2021-04-19 20:48:03 +08:00
Mill Chen
feae056067 Tweak the layout of top app bar
- Update the color of content scrim
- Dynamically change the height of collapsing toolbar according to the
  line count of title
- Fix the jank problem of collapsing toolbar

Fixes: 184615642
Fixes: 185003521
Fixes: 182770567
Fixes: 184209747
Test: visual verified
Change-Id: I78c517eb9bec0b85997085970007481d1a4ef7d3
2021-04-19 17:29:18 +08:00
Julia Reynolds
9a238e5124 Restyle notif history to beter match shade
Test: manual
Fixes: 184695659
Fixes: 183949048
Fixes: 184695652
Fixes: 185271315
Change-Id: I79a937d7d64e6bdf0014ce3f939e6e96690556b9
2021-04-14 12:28:16 -04:00
Fan Zhang
32b6e7ad7a Minor UI tweak on Safety settings
* Move "more settings" button to top
* Changed button shape to have a more rounded corner radius.
* https://screenshot.googleplex.com/HCrnFHKAGxYcHci.png

Bug: 184261824
Test: manual
Change-Id: I907869bd459ee18eb9ba06f89f220185fdc8c276
2021-04-05 23:43:35 +00:00
Jason Chiu
c37dd71260 Settings homepage redesign
- Support new suggestion design
- Search bar relayout
- Move avatar icon to the top right corner

Test: robotest
Bug: 178068045

Change-Id: I07f1577488d6d1827ee07d55db6759f02d655d5f
2021-03-24 18:53:27 +08:00
Mill Chen
dc92d9e4c4 Make sucUsePartnerResource configurable
The sucUsePartnerResource attribute should be able to configure
seperately. In order to make it happen, we created a config for
sucUsePartnerResource.

Bug: 179882711
Test: robotests
Change-Id: I755ea30f52d58167ab377277f7181696e72e184c
2021-02-26 23:53:54 +08:00
Jason Chiu
8863015827 Fix the suggestion button distortion
- The button is distorted when setting font/display size to largest.
- Auto resize and limit the max lines of the header so that the button
  won't be squeeze to the bottom.

Fixes: 178459387
Test: visual, robotest
Change-Id: I491be5c3d70c643244fa989324e828774e15b34d
2021-01-29 17:06:43 +08:00
Jason Chiu
524feaf31c Merge "Adjust homepage styles and layouts" 2021-01-25 09:43:22 +00:00
Jason Chiu
b56ea7e9e3 Adjust homepage styles and layouts
- Fine tune the header text size and position
- Fix the header overlapping problem on the homepage and collapsing
  toolbar pages when configuration changes by adding android:id.
- New AppBarScrollingViewBehavior for the homepage to avoid manually
  offsetting the IA
- Correct the formula of counting search box height

Test: robotest, manual
Fixes: 177967923
Fixes: 177968564
Change-Id: Id3ed44f4296fa2a19d6890b009d3881a5c140bbd
2021-01-22 13:27:22 +00:00
Tsung-Mao Fang
3692c70cc1 Fix truncated issue on search text
Test: See the screen
Fix: 177665666
Change-Id: I4941ff95320141c7ea7c9f1947138c6940bdf501
2021-01-21 10:23:44 +00:00
Mill Chen
02811e52bd Visual updated for CollapsingToolbarLayout
- Tweak the margin for expanded title
- Increase the height of content scrim
- Enlarge the font size for expanded title

Bug: 177191754
Test: visual verified
Change-Id: I2463aa45cd60de1333b6433310f9bf69f090c958
2021-01-14 15:11:50 +08:00
Tsung-Mao Fang
1b849dbe2a Correct the naming for homepage preference
- Have a consistent naming rule for homepage.
- Make the font family of title can be modified by system.

Test: See the screen, and font family of title is correct.
Bug: 177213699
Change-Id: I8e3ebbf06a8c1849956100c8d2825f98ad251b37
2021-01-13 23:14:58 +08:00
Tsung-Mao Fang
6c921e5b6c Refine the preference layout for homepage
Based on the Android S design, we update the layout
for homepage.

The scope covers the layout of preference and icons itself.

- Change the icon size for IA items.
- Change the layout spacing of preference.
- Change the margin or search bar.

Test: See the screen and confirm with UX
Bug: 177213699
Change-Id: I985966fdf39a5989d51991aa3c06ea5fd31e8fe2
2021-01-12 12:42:44 +08:00
Mill Chen
14cfd2f2ca Add CollapsingToolbarLayout for sub settings
Settings app is planning to make toolbar collapsible for next
Android release. This CL is to add a new layout for
CollapsingToolbarLayout in the Settings app and to update the theme
correspondly. This feature will be controlled by feature flag, which
makes Settings app compacitible with the existing layout.

Bug: 174451673
Test: manul test and visual verification
1) Enable the feature and open Settings app
2) Navigate to each sub page and check if toolbar is collapsible

Change-Id: Ibef524bbaa7ae3f0a43db7e40e599f42e009437f
2021-01-11 18:30:20 +08:00
Jason Chiu
bd854ccd10 Support contextual suggestion
- add a suggestion layout
- add an interface to get fragment in suggestion feature provider
- remove the first preference category of homepage IA to align its top
  with the bottom of the search box

Bug: 173768418
Test: robotest
Change-Id: I784e3eef29ca474c4c89f07b916c6500fabbf7d4
2020-12-27 01:37:30 +08:00
Alex Johnston
25cca45c09 Merge "Add credential management app preference to Settings" 2020-12-03 10:00:27 +00:00
Alex Johnston
672c2aaaec Add credential management app preference to Settings
Background
* This is part of the work to support
  a credential management app on
  unmanaged devices.
Changes
* Add a preference controller which will only
  be enabled if there is a credential management app.
* Add a fragment to display details on the credential
  management app and its policy. Add a remove button
  to remove the credential management app.
* Link CredentialManagementAppAdapter to new fragment
  and add expander.

Manual Testing
* Verify preference is disabled if there is no credential
  management app.
* Verify preference summary shows credential mangement
  app name if a credential management app exists.
* Verify fragment details page displays the
  authentication policy correctly.

Bug: 165641221
Test: Manual testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppFragmentTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppControllerTest
Change-Id: I06d6b88d0c89022f7a6cbf3031834defcb54bd51
2020-12-03 07:23:50 +00:00
Alex Johnston
a12b402f36 Show Floating action button to request manage credentials
Background
* This is part of the work to support
  a credential management app on
  unmanaged devices.
Changes
* Show FAB for detailed/long manage credentials
  authentication policy.
* Hide FAB for short manage credentials
  authentication policy.
* Unexpand FAB once the user start starts
  scrolling.
* Hide FAB once the user has scrolled to
  the bottom.

Manual Testing
* Verify FAB is shown for a detailed/long policy:
  https://screenshot.googleplex.com/BUb4LGz3GD6AozS
* Verify FAB is hidden for a short policy
* Verify FAB is hidden when user has scrolled to the
  bottom:
  https://screenshot.googleplex.com/6FQRqto3r3jzfXH
* Verify FAB is unexpanded (text hidden)
  when the users start scrolling:
  https://screenshot.googleplex.com/4FfAt5MsCfrAwQK

Bug: 165641221
Test: Manual Testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.RequestManageCredentialsTest
Change-Id: Ied2ef726ad4dcc3f92c20249f80294f0a3071a8a
2020-12-02 17:17:12 +00:00