Commit Graph

168 Commits

Author SHA1 Message Date
Maurice Lam
a2f0fe91fd Merge "Fix sizing of pattern view" into oc-mr1-dev am: adef5b23e0
am: 4f61cfb967

Change-Id: I84059c89eda774c833c710166a1778bd36c6ff98
2017-09-11 20:17:18 +00:00
Maurice Lam
7efcc35d85 Fix sizing of pattern view
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)

Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
2017-09-11 20:07:17 +00:00
Fan Zhang
797d2e126a Clean up styles and delete unused layout for action buttons
Change-Id: I65725b4ea04087b582a08497fd838d14e834b47a
Fixes: 63991885
Test: robotest and visual
2017-08-03 16:16:18 -07:00
Fan Zhang
2d28a4ceb4 Unify action buttons to a common widget (part 1)
- Create a preference type to host action button preferences.
- Convert app battery usage page to use the new preference
- Convert wifi detail page to use the new preference

Change-Id: I60bc473986ab46f2897e2537eb0e013fa813a4fc
Fix: 63991885
Test: robotests
2017-07-28 01:00:39 +00:00
Doris Ling
78e08f0f0a Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
TreeHugger Robot
d10a1af258 Merge "Search bar polish" into oc-dr1-dev 2017-07-07 17:39:11 +00:00
Andrew Sapperstein
a22768cc1e Search bar polish
Updated main page text color, text size, and search bar height.
Also updated results page text size.

Change-Id: Ic4a390136b854741a73e99431b8dd9452871dd2c
Fixes: 63397599
Fixes: 63394285
Test: robotests and manual
2017-07-06 16:37:00 -07:00
Andrew Sapperstein
ccbb4cfc2c Use config_headlineFontFamily for password screens.
These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.

Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.

Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes: 62873478
Test: manual
2017-07-06 14:30:28 -07:00
Doris Ling
83a6621b38 Combine settings suggestion and condition.
- Add a flag in dashboard feature provider to specify whether to use the
combined UI for suggestions and conditions.
- Move Conditions below Suggestions.
- Add dashboard entity for condition and suggestion container, and
  wrap the condition and suggestion list inside the container. The
  container itself will be a single dashboard item, and within it will
  be the list of suggestion or condition.
- Add suggestion/condition header that will show the combined info for
  the conditions and suggestion data, and have the expand button to
  control expanding both the suggestion and condition list.
- Change the individual condition card to be always expanded, and
remove the logic to collapse/expand individual condition card.
- Remove the divider between the action button and condition detail
  within each condition card.
- Add suggestion/condition footer for collapsing the whole suggestion and
  condition list.

Bug: 37645754
Test: make RunSettingsRoboTests
Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
2017-06-02 14:59:48 -07:00
Maurice Lam
470503e984 Merge "Make lock pattern more usable on small screens" 2017-05-16 02:08:54 +00:00
Maurice Lam
4853cce971 Make lock pattern more usable on small screens
- Remove the icon on screens smaller than sw400dp
- Make sure all margins and spacing are removed before shrinking
  content
- Shrink the pattern view to avoid cutting off the text at the top

Test: Manual
Bug: 38269249
Change-Id: I5d7bf956929f52952a588962febf3dcf43286b76
2017-05-15 17:24:34 -07:00
Fan Zhang
1eec4084ed Fix vpn config dialog text alignment in RTL locales
Change-Id: Ifc5a14285a337b2b168a4c6770d92f3da328b9d0
Fix: 38142136
Test: visual
2017-05-15 15:19:09 -07:00
Evan Laird
227affaf29 Cleanup to screensaver settings for O
Reworked the way screensaver settings are laid out for O. Instead of
using the options menu and dialogs to navigate screensaver options,
there are now two rows: one row for the screensaver choice and
optionally its own settings, and one row for the "when to show" setting.
And now there's a nice obvious button you can press to preview your
choices.

Test: 'export ROBOTEST_FILTER="RadioButtonListFragmentTest";\
mmm -j20 packages/apps/Settings/tests/robotests'

Bug: 35031991
Change-Id: Ie7d2055fb45f6dfe72e34cb9598d9a25f7bee75a
2017-05-01 20:08:16 +00:00
Fan Zhang
be6fab0135 Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
  app header.
- Add a shadow below app header view. We can't set elevation on app
  header unfortunately because that will add shadow all round the view,
  but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.

Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix: 37207527
Fix: 37079248
Test: visual && make RunSettingsRoboTests
2017-04-17 09:30:40 -07:00
Maurice Lam
40a0db9afd Merge "Support center alignment" 2017-03-27 20:27:22 +00:00
Maurice Lam
8d5a4f1689 Support center alignment
Update styles to reference the theme attribute suwGlifHeaderGravity
to, directly or indirectly via SuwDescription.Glif.

Test: Existing tests pass
Bug: 36368632
Change-Id: I6c7c234c32fdd614d4a9cdfabbef05626dad0a93
2017-03-24 15:48:14 -07:00
Charles He
b436519129 Merge "VPN settings: gray out always-on checkbox dynamically" 2017-03-23 08:49:47 +00:00
Charles He
ad828f1551 VPN settings: gray out always-on checkbox dynamically
In the ConfigDialog for legacy VPNs, many configurations do not support
Always-on VPN. Previously, when a user entered an unsupported set of
settings, the Always-on VPN checkbox could still be ticked, and the
Save or Connect action buttons would be disabled. This was not intuitive
as the user could not easily figure out which part of the settings was
incompatible that grayed out the action buttons.

With this change, we disable the Always-on VPN checkbox immediately as
the user enters any incompatible setting. We also display the reason why
Always-on VPN is disabled. This will make it more straightforward for
the users to understand which setting is conflicting with the Always-on
feature.

This change is also the first step towards refactoring the ConfigDialog
for legacy VPNs with PreferenceFragment.

Test: manual
Bug: 29208008
Bug: 28072644
Change-Id: I1e6d32a1069ca0b936513f4985ffb9a9412b249c
2017-03-22 20:29:46 +00:00
TreeHugger Robot
e0090cc711 Merge "Revert "Use color accent as background color for app info pages."" 2017-03-20 21:02:25 +00:00
Doris Ling
6743407475 Revert "Use color accent as background color for app info pages."
This reverts commit b2032416e9.

Change-Id: Ie80e061e6ccecbcf96404c5349ab136da7ca599f
2017-03-20 19:02:42 +00:00
Lei Yu
0ff13a4971 Merge "Remove hardcoded color for settings dashboard" 2017-03-14 20:01:33 +00:00
jackqdyulei
9d690bdbd7 Remove hardcoded color for settings dashboard
1. Change card_background to default background color. In settings
light theme, background color is exactly the #fafafa
2. Change card_background_grey to colorSecondary, which is
material_grey_200 in settings light theme.

Bug: 36139640
Test: Screenshot
Change-Id: I20081e768985ce6c0b9000448ae48599f18b293a
2017-03-14 10:40:09 -07:00
Doris Ling
b2032416e9 Use color accent as background color for app info pages.
Bug: 34977561
Test: visual
Change-Id: Idc03d33a318d7908a47e76738f7d098ab60fb0fe
2017-03-10 14:15:14 -08:00
Jason Monk
6fca98f905 Switch references to colorError
Test: make
Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946
2017-02-24 14:57:31 -05:00
Maurice Lam
bdfc27f9ac Update GLIF button styles
- The negative/secondary button styles now have the correct alpha
  for the touch highlight. (24%)
- The negative/secondary buttons now align correctly based on their
  labels text, instead of based on the bounds of the touch highlight.
- Fixed issues with button shadows being cropped.

Test: Manual inspection. Existing tests pass.
Change-Id: I261e504d661d7a53eda3561a26942ea11ba0d429
2017-02-21 18:24:39 -08:00
Doris Ling
2ed09339d4 Update layout for App info page.
- Move the app link buttons to the right
- Move the footer buttons to the top below the header
- Rename the app header details title, summary, and icon views.

Bug: 34977561
Test: make RunSettingsRoboTests
Change-Id: Id0cfc2b73b4e5cbbc1a58e497da52560892b69c8
2017-02-15 12:33:42 -08:00
jackqdyulei
a224b010b9 Create Advanced battery page
The advanced page shows two major parts, one is the battery usage
graph and the other is battery usage list. In usage list, each item
shows basic info of battery usage of one type(e.g. Apps, System)

Bug: 34385770
Test: RunSettingsRoboTests

Change-Id: I22475a489285787afa775af8d5ae3340eff1eed9
2017-02-06 13:44:59 -08:00
Fan Zhang
35692cf439 Full screen default app fragment
Fix: 34280137
Test: make RunSettingsRoboTests
Change-Id: Ib44e39589781d68c7952a2c16a44682791a422f1
2017-01-23 16:08:42 -08:00
Daniel Nishi
a3494347e4 Add ASM enabled/disabled text to the Storage settings.
Bug: 33199077
Test: Settings Robo Tests
Change-Id: I86897c63b584d3c8be171723367a6b4e060684f3
2017-01-12 02:37:12 +00:00
Daniel Nishi
b465005c29 Update the storage summary header.
This changes it to now have a donut graph and reflects the new UI.
Finalized redlines are still pending, so there will be a follow
up patch to get everything aligned as per the mocks.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: Ic12a77bd9be335af14f80886d1ecc24c82940e9b
2017-01-11 12:37:33 -08:00
TreeHugger Robot
a6c3e3ace5 Merge "Add header and remove button to account detail page." 2017-01-06 23:02:12 +00:00
Doris Ling
fd06d2fcf4 Add header and remove button to account detail page.
- Add account header which contains the account icon and name to the top
  of the account detail page.
- Also add the remove account button to the bottom of the page.

Change-Id: I24f1a17a7f9c4dd8c840a2b0329c0965e4e612e9
Fix: 33543525
Test: make RunSettingsRoboTests
2017-01-06 13:20:08 -08:00
Fan Zhang
e96b5b9faa Apply LightActionBar theme to Settings app.
Bug: 33558692
Test: visual
Test: RunSettingsRoboTests
Change-Id: I9f0fb71eb0cd0c58ac3b0f69544adec963faf2dd
2017-01-04 12:28:03 -08:00
Maurice Lam
f8a325c7c6 Remove WifiSetupActivity
That activity was copied into setup wizard and is no longer used.

Also removed setup_illustration_lock_screen because that is also
not used in the current GLIF theme.

Test: Existing Robolectric tests pass
Bug: 33590605
Change-Id: Ib2ea02a5e4bce17a7ea829b854f73caf7d5c5f97
2016-12-14 22:41:58 +00:00
Fan Zhang
1c118b5f2a Always reserve space for preference icons.
This aligns text on preferences on the same screen when some of them
don't have icons.

- Use a custom layout for
  preference
  EditPreference
  switch preference
  VolumeSeekPreference
  DialogPreferencei
  Restricted*Preference
  DropdownPreference

- Moved related style defs into a new file styles_preference.xml,
  because current styles file is too large to read.
- Switch <PreferenceScreen ...> to <Preference ...> for a bunch of
  regular preferences.
- Also removed some dead style.

Bug: 33430928
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java

Change-Id: Ic9b75d3f133f2a83cd999297b8596253d4b10161
2016-12-12 16:02:45 -08:00
Fan Zhang
80d1ec7dee Tweak UI for action buttons under app header.
- Make a transparent button with border style

Bug: 1584976
Test: manual
Change-Id: Ide53d71963afd4587834357999b40df81bb93500
2016-10-29 15:22:55 -07:00
Fan Zhang
1ff25ba7e6 Modify AppHeaderController to provide UI for notif settings
- The AppHeaderController is no longer a singleton. Each time appheader
  should be updated we will create a new controller. It acts as a
  builder/mutator, user provides customizable inputs, and the controller
  will bind everything to UI when calling done().

Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Icfc5bcd8bc170a02b57432d864eaddf71db0d5b4
2016-10-27 17:23:33 -07:00
Fan Zhang
c9536b8e41 UI Refresh: a new app info header for app/notification.
- moved force stop and uninstall button to bottom of page (as footer)
- Forked appheader layout file, and created AppHeaderController to
  contain all binding logic for header.

Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Id4eb365ca25e035c043c068867f5cbc3a202b201
2016-10-27 13:48:13 -07:00
Maurice Lam
67df126291 [Fingerprint] Make enroll progress bar scalable
Make the fingerprint enroll progress bar scalable by moving it to a
single FingerprintProgressBar view and make it fill the remaining
space.

- The background fingerprint icon was changed to include the padding
internally so it can be added as the background directly onto the
progress bar view.
- The icon in landscape mode is also fixed to use the fingerprint
icon rather than the lock icon.

Test: cd tests/robotests && mm
Bug: 32123370
Change-Id: Ia5cf37d92f0af7c1cf39287f5070c44f51d44878
2016-10-20 17:20:56 -07:00
jackqdyulei
a709e7546e Layout change in support card and support dialog
1. Wrap the support_disclaimer_content by scrollview.
2. Change the layout in support_escalation_options using layout_weight.
3. Add styles in layout-sw300dp and layout-sw400dp

The target scope is between 300dp->400dp, so I add the default style
in sw400dp and changed style in sw300dp to cover it.

Bug: 31399419
Test: Visual
Change-Id: I117acb0c5b992bea2cded6cd48749c4ed7b04488
2016-10-17 15:12:37 -07:00
Steven Ng
4fdcec71dc Provide fingerprint options for SET_NEW_PASSWORD intent
1) Added a trampoline activity to display SET_NEW_PASSWORD intent.
2) On devices that have fingerprint sensor and have no enrolled fingerprint,
   ChooseLockGeneric handles the SET_NEW_PASSWORD intent by providing
   fingerprint + {PIN/PATTERN/PASSWORD} and skip fingerprint options.

Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   a) Fingerprint + pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Pixel Imprint + Pattern.
      iii) Set a pattern lock.
      iv) Can enroll a fingerprint.
   b) Pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Continue without Pixel Imprint
      iii) A list of unlock options, without fingerprint option, is shown.
      vi) Select and enroll a pattern lock
   c) Has an existing password
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Setting app asks for password input.
      iii) Enter password and click "Continue without Pixel imprint".
      vi) No password is asked. A list of unlock options, without fingerprint option, is shown.
      v) Select and enroll a pattern lock
   d) Work profile
      i) Create a work profile
      ii) adb shell am start --user x -a android.app.action.SET_NEW_PASSWORD. X is the work profile user id.
      iii) Click Pixel Imprint + Pattern.
      iv) Set a pattern lock.
      v) Can enroll a fingerprint.

Bug: 23017051
Change-Id: I6384bbffb72a5d3a83972da7474532746e4d06b9
2016-09-26 22:13:08 +01:00
Doris Ling
706071126a Add scrollbar to Settings app.
Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.

Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes: 30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
2016-08-18 15:58:21 -07:00
Robin Lee
232f057df0 Futureproof trusted credentials for multiple profiles
Made use of the shiny LayoutTransition.CHANGING animations. Now it's a
little more obvious where things are going when tapping a header.

Future work: maybe show the usernames / user icons in there too? This
could get complicated, and it'll need to be done everywhere at once.

Change-Id: Id7396235abe6218d591d16db91af0f56a83a7bcd
Fix: 28310002
2016-08-02 12:12:14 +01:00
Matthew Fritze
892a54696b Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
This reverts commit f179f845e5.

Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
2016-07-21 01:03:45 +00:00
Matthew Fritze
f179f845e5 Revert "Error colors to point to frameworks instead of hard-coding them"
This reverts commit ae63c3db14.

Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
2016-07-21 00:55:21 +00:00
Matthew Fritze
ae63c3db14 Error colors to point to frameworks instead of hard-coding them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res/.

Bug: 30021554
Change-Id: I6ec0512c5e69bc822810745b1745fa9feff95150
2016-07-19 16:10:31 -07:00
Maurice Lam
ea24bbf317 Add ripples to negative buttons
For the negative buttons (buttons on the left side) of screen lock setup
and fingerprint setup screens, instead of theming it like a text link,
inherit from the borderless button and set the highlight color to color
accent.

Bug: 29905448
Change-Id: I4a3d28d4a0658740d0cb622e40031ab0ca22e6a0
2016-07-12 21:54:08 +00:00
Fan Zhang
016bd60491 Update escalation cards layout and data binding.
Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c
2016-06-30 13:57:22 -07:00
Maurice Lam
a028010c23 Merge "Update UI style for GLIF buttons" into nyc-mr1-dev 2016-06-15 17:07:54 +00:00
Maurice Lam
52ae1eb04b Update UI style for GLIF buttons
Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
2016-06-14 18:35:37 -07:00