Commit Graph

166 Commits

Author SHA1 Message Date
Maurice Lam
f5b42777c1 Support GLIF v3 for lock screen settings
Also removed setup_divider_color because it's unused and is causing
a lint error.

Test: cd tests/robotests && mma
Bug: 72702989
Change-Id: I81894be6458439f688c0144d1136d3d7f75afa25
2018-01-30 21:01:42 -08:00
Fan Zhang
9de4999015 Move styleActionBar to onStart()
Change-Id: I002c266acc0e1095269e92eb7988b1ab505e48ff
Fixes: 72097389
Test: robotest
2018-01-17 17:29:33 -08:00
Fan Zhang
46b5474be4 Update master switch style
- When off, background grey
- When on, background accent
- Switch toggle always white, only change the slider color during on/off

Change-Id: I0ca49439f4e20e75517d503f28cc3068930591e8
Bug: 69462439
Test: robotests
2018-01-10 15:52:20 -08:00
Ajay Nadathur
a248b34ce3 Add rounded corners to wifi connection dialog
bug: 69930374
Test: Manually tested and verified
Change-Id: I458c12d3642f9866a00eb1b0f9a5b8a323465892
2017-12-19 14:47:08 -08:00
Ajay Nadathur
4f3885a767 Update dialog styles to material 2
Bug: 69930374
Test: Manually tested
Change-Id: I4215d0283cbbfcc929b891f5b419b52b1de8598a
2017-12-15 13:52:43 -08:00
Maurice Lam
e9a6e8f1e5 Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Fan Zhang
f559395603 Use preference theme from SettingsLib
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
2017-07-10 14:56:49 -07:00
Andrew Sapperstein
893cb0987a Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:01:00 -07:00
Anna Galusza
50d359aa38 Merge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6
am: 86d10d65ab

Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de
2017-04-18 19:48:03 +00:00
Anna Galusza
cc7de0c36d Update Setup Wizard Vision Settings colors.
Bug: 34470898
Test: UI updates only.

Change-Id: I8693004637f31a433c6911a4c99d5dd1426d76f1
2017-04-13 20:29:45 +00:00
Maurice Lam
e0e81b68c6 Make GLIF v2 available to OEMs
Rename GLIF Pixel to GLIF v2 and make available to OEMs. In this
model settings read the EXTRA_THEME from the intent and picks between
GLIF and GLIF v2.

Test: Manual
Bug: 36857917
Change-Id: I4899a3d041abaf0b97843cf14affc8d6f9587a22
2017-04-05 21:59:28 +00:00
Stefanot
dfb842a811 Add new theme in Settings.
We add this style so activities can use SuwThemeGlif.Light theme but
also use Settings default window animations.

Test: RunSettingsRoboTests

BUG: 35959708
Change-Id: Iaedfbf4b9321ff4d32ab44c57b01d9d4a24e0d03
2017-03-15 18:18:49 +00:00
Fan Zhang
fbefd9ea01 Add dividers on a few preferences
Fix: 36023418
Fix: 36058273

Test: visual
- On top of emergency preference
- On top of footer preference

Change-Id: Iefbbf0ad410d46c466f919ecb60b572dd6f1ea28
2017-03-08 15:29:25 -08:00
Fan Zhang
a6986e7ed2 Misc fix for secondary user
- Theme fix: action bar and status bar color now have enough contrast
  for SUW theme.
- Fix a ConcurrentModificationError when switching between users
  quickly.

Change-Id: If31f88e36f1d4c5d7f90bc9d128041f0e0a81ff9
Fix: 35948464
Test: make RunSettingsRoboTests
2017-03-08 13:09:17 -08:00
Fan Zhang
1faaf6ea66 Use light status bar theme in confirm credential activity
Change-Id: I21443fd4eedf3ec9760e751a39d624e0c75530d5
Fix: 35996219
Test: visual
2017-03-07 13:44:18 -08:00
Jason Monk
6fca98f905 Switch references to colorError
Test: make
Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946
2017-02-24 14:57:31 -05:00
Fan Zhang
92f1e942da Misc fix on settings themes.
- Use dark status bar for confirmDeviceCreditials theme to match dark
  window background
- Remove SubSettingsDialogWhenLarge theme in favor of full screen
  settings for O.
- Update font/dize preview text color to match light background

Bug: 33558692
Test: visual

Change-Id: Id8704c96e2ce35247e80e50eefd531786479b193
2017-01-21 11:10:06 -08:00
TreeHugger Robot
a909a54835 Merge "Change theme base back to Theme.DeviceDefault.Settings" 2017-01-20 17:20:08 +00:00
Fan Zhang
a7689b4f2a Change theme base back to Theme.DeviceDefault.Settings
Bug: 33558692
Test: visual
Change-Id: I526f8ff19bb2a4c471ff567e926574e19c0d307a
2017-01-19 12:30:48 -08:00
Stephen Chen
20bfe52959 Add drawable resources for Wi-Fi picker friction icons.
Bug: 34281330
Test: manual inspection, make
Change-Id: I7a98ececf4804e3444514ff1c438e5ed4f9705d5
2017-01-19 12:21:06 -08:00
TreeHugger Robot
c4a4c9445a Merge "Apply LightActionBar theme to Settings app." 2017-01-06 00:10:29 +00:00
jackqdyulei
8a8f47c6f3 Fix robolectric breakage because of internal resources
The robolectirc breakage is mainly because of ag/1726837 and the
current robo tests cannot deal with private resources. Robo engineer
will working on this to make sure robo tests is compatible with private
resources(b/33431346) and be globally used.

This is a temporary fix to stop the breakage by adding the hardcoded
color and will be reverted after b/33431346 is finished.

Test: make -j40 RunSettingsRoboTests
Change-Id: I5f451d94f0162c818b98aaaa49d452d926dd83b1
2017-01-05 10:22:04 -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
Lei Yu
557d830502 Merge "Set statusBarColor to secondary_device_default_settings" 2017-01-03 19:10:08 +00:00
Maurice Lam
1168a7d794 Merge "Use regular preference theme for setup wizard" 2017-01-03 18:18:22 +00:00
jackqdyulei
c3b0724c61 Set statusBarColor to secondary_device_default_settings
The SettingsDrawer has a translucent scrim on top of status bar,
which makes the color of status bar darker. By resetting the
statusBarColor we can make the real color of status bar to
"#242424" as close as possible.

Bug: 30811708
Test: Manual - Take a screenshot
Change-Id: I639ccac9d32aff9df5854c009da1fae15ba0e71f
2017-01-03 09:40:19 -08:00
Maurice Lam
ce4a5ade9b Use regular preference theme for setup wizard
Use the regular preference theme rather than the settings specific
one, because setup wizard doesn't want the space reserved for icon
done in the settings theme.

Also minor changes to Espresso FirstIdViewMatcher for a more
descriptive message.

Test: runtest --path tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
Bug: 33922083
Change-Id: Ic878ccf7b01cfa090ca4587b160e1f9dedfb8d3a
2016-12-29 15:59:29 -08:00
Fan Zhang
0f79feaa93 Align seek bar type preferences to reserve icon space
Bug: 33775510
Fixes: 33787883
Test: visual

Change-Id: I886e75551f3510d85b6047cc55c26dd21c5c55df
2016-12-27 10:30:01 -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
Maurice Lam
c515287800 Fix touch ripples for setup wizard screens
Make PreferenceTheme.SetupWizard inherit from PreferenceTheme so the
preference layout from the support library is used.

Automated tests were not added because when trying to test
SettingsActivity under Robolectric, it fails due to the lack of API
24 support.
(https://github.com/robolectric/robolectric/issues/2554)

Test: (Manual) Ripples shown when touched and keyboard focused.
Bug: 32671413
Change-Id: I5271aaddbcfdb7ee0a71bc3c223e6dc62a5ecb47
2016-11-10 18:29:46 +00: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
Anna Galusza
34cebb88fd Fix insufficint contrast on Vision Settings toggles. am: e212817785 am: 5bf1f668ff
am: 0f2799799c

Change-Id: Idd8af227e76f36e6ca7fe148abba5ce065c21c38
2016-10-20 03:57:00 +00:00
Anna Galusza
e212817785 Fix insufficint contrast on Vision Settings toggles.
Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
2016-10-19 15:41:00 -07:00
Jaewoong Jung
97e8c99172 Deligates some themes.xml attributes to dimens.xml.
Bug: 31448445
Test: Inspected manually.
Change-Id: Ifda3424287cde4474eb20be53c3ff3e54e6eba5e
2016-09-28 15:57:42 -07:00
Doris Ling
124251d54e 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-23 10:46:06 -07:00
Adam Lesinski
701af87a68 Build with AAPT2
Change-Id: Ib0b4a597efae178785c308451b882196c2fb807a
2016-08-17 10:19:00 -07:00
Jorim Jaggi
bbf6e5e0c5 resolve merge conflicts of 4c839a5 to master
Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be
2016-08-02 22:26:55 +02:00
Jorim Jaggi
984079442f Show progress user unlocking is delayed
Sometimes it takes a while to unlock a user, for example, after an OTA.

In these cases, we show a progress bar in FallbackHome so the user knows
that something is happening.

Fixes: 30213213
Change-Id: Ie36a9b3107c32ff46a8890818d1f26ccf310ee6c
2016-08-02 20:02:42 +02:00
Svetoslav Ganov
b06766f129 Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
2016-07-22 20:08:44 -07:00
Fan Zhang
c9fca1a1ee Add ripple effect on all preference tiles.
Bug: 30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42
2016-07-19 16:04:28 -07:00
Jorim Jaggi
a616a0dd02 Fix ugly flash between boot animation and setup wizard (1/2)
When FallbackHome is displayed before the setup wizard, we need to
match the last frame of the boot animation in FallbackHome.

Bug: 29054814
Change-Id: I4f0096d398341c3749820177cebc26dea85cea05
2016-06-29 16:57:33 -07:00
Andrew Sapperstein
e300b0fc1c Use colorSecondary for switch bar backgrounds.
Delete the private version in favor of using the platform's.

BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
2016-06-21 11:50:20 -07:00
Andrew Sapperstein
5b66e143cc Update Settings to use DeviceDefault.Settings.
BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Maurice Lam
2016b1acdb Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev 2016-05-26 18:54:02 +00:00
Maurice Lam
b75baac925 Make fingerprint inherit from GLIF theme
Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
2016-05-26 00:22:36 +00:00
Andrew Sapperstein
7232e4f7ee More theming fixes.
Updated the importance seekbar to use colorAccent instead of a hardcoded
color.

Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).

Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.

BUG: 28760785

Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3
2016-05-25 10:55:11 -07:00
Andrew Sapperstein
0067760b50 Fix confirm lock UI theme.
Now uses colorPrimary as its background color and sets colorAccent
directly. Some other mild cleanup as well.

BUG: 28760785

Change-Id: Ib8e5140b789449e518b498bc49438cb4a2bc6451
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
ddc21c0fb1 Update Theme.DialogWhenLarge to use theme colors.
This theme is at least used by the Phone Status activity and probably
others as well.

BUG: 28760785

Change-Id: If3faa84ad9d291f007c7191f1c0dba8d98fe9bf8
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
8da144bdee Update alertDialogTheme to use proper colorAccent.
The settings dialogs were all using the default colorAccent.
Now it uses the app's version.

BUG: 28760785

Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23
2016-05-24 18:08:36 -07:00