Commit Graph

37 Commits

Author SHA1 Message Date
Chaohui Wang
b547927d26 Migrate SyncStateSwitchPreference to SwitchPreferenceCompat
UI not changed in this cl, this cl helps UI switch in the future.

Bug: 306658427
Test: manual - on "Account sync" page
Test: manual - on "Turn screen on" detail page
Change-Id: Icd91bb69fdce302d9b9e92f501d1b1eaf2051960
2023-10-26 13:37:22 +08:00
Bonian Chen
61c45064cd [Settings] Limit height of TextView when text too long
Adjust the layout through having ConstraintLayout for limiting the
height of TextView.

Bug: 205460459
Test: local

Change-Id: Ic15af4c9be393a6855d78a5d9af086b099c9b689
2023-01-10 07:36:21 +00:00
Edgar Wang
1e3c0115a5 Tweak SeekBarPreference to folow new Settings UX design
Bug: 186068091
Test: visual verify
Change-Id: I2cd7f57a75f8512080e9b5e891c27db6297b0729
2021-06-16 03:47:36 +08:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings"
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Edgar Wang
d6b5bbb5cb Apply SettingsLib SeekBarPreference to Settings
Bug: 176818438
Test: robotest

Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
Edgar Wang
54aacf80fe Merge "Align the items in account sync page to the start border" into sc-dev 2021-05-24 06:08:30 +00:00
Jason Chiu
4b1d1e21d5 Align the items in account sync page to the start border
The prefernces haven't been applied to the SettingsLib preference theme
which sets iconSpaceReserved false.

Fixes: 187670431
Test: visual, robotest
Change-Id: Ifa797fbec4f207248fd0254e26d456b8889e25d8
2021-05-24 10:13:53 +08:00
Edgar Wang
600d023892 Make preference title align after icon
- Running service should use app preference layout.
- RestrictedDropdownPreference should use preference layout.
- Tweek Storage item icon padding
- Wifi calling should use Prefernce
- In Open by default page, if there is no vierfied link, we should
  hide the checkbox.

Bug: 186069482
Test: manual
Change-Id: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
Merged-In: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
2021-05-21 07:21:59 +00:00
Edgar Wang
b54caf63f2 Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib
Bug: 182179573
Test: robotest & manual
Change-Id: Iadb51c8601b49294eef2f6fb13369576e62e5b7a
2021-05-07 17:41:02 +08:00
Peter_Liang
d2658b57d8 Fix the entire text is aligned middle of the Vision setting screen.
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.

Solution:
Remove the overriden preferenceStyle.

Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
2021-04-21 22:08:45 +08:00
Edgar Wang
817a167416 Apply SettingsPreferenceTheme in Settings
- Set all of preference style inherit from SettingsPreferenceTheme
- Apply to Theme.Settings and Theme.Settings.Home
- Fix robotest failed in ScreenTimeoutSettingsTest

Bug: 185206291
Test: manual & robotest
Change-Id: I855d003b10348569903855fcbf235bc00265658b
2021-04-14 16:36:14 +08:00
Edgar Wang
a763ba93c1 Move Settings preferenceCategory style into SettingsTheme
Bug: 176407895
Test: manual
Change-Id: I98245dfdf27a3848c24e81f4d5d8f5f19e1e817c
2020-12-28 10:10:26 +00:00
Sunny Shao
b5556e847c Add a new SettingsCategoryPreference style
Fixes: 156856670
Test: manual review
Change-Id: I3d95c62aa5127be98036e2ea16d5f066461fb620
2020-06-10 17:07:55 +08:00
Sunny Shao
9434d26237 Update the color of the preference category
Use the new attribute preferenceCategoryTitleTextColor to change the color of
the preference category.

Bug: 117402186
Test: manual view
Change-Id: If2df5529a63ff9cd96f242a9ea5f3dac053b0fd2
2019-09-27 13:57:04 +08:00
Mill Chen
e3e966689d Update listDivider for PreferenceFragmentCompat
The support library uses preference_list_divider_material for its list
divider and its color is a hardcoded value. That's why the divider color
can't be applied to the PreferenceFragmentCompat in Settings when
updating the divider color in the device defaults theme level. To make
it so we set its listDivider to list_divider_material to facilitate updating
the divider color.

Bug: 129943610
Test: visual
Change-Id: Ie992b925fae0effd4e00682a911ad004ac3fc033
2019-05-10 17:23:49 +08:00
Raff Tsai
c30a8ed011 Change preferece category text style
Fixes: 117402186
Test: visual
Change-Id: I06fb4ca5acdbdef730e0799f4b6db647f104ff25
2019-03-01 09:40:55 +08:00
jackqdyulei
6da5e32bd8 Add CardPreference in battery settings page
This is MatrialCardView styled preference that only support
icon, title and summary.

Bug: 119618813
Test: RunSettingsRoboTests
Change-Id: Ibbf9eb2a01c8ee0579e1553ead6e43e96531c92a
2019-01-11 11:00:03 -08:00
jackqdyulei
cf6374e427 Build infra to inject slice to PreferenceFragment
Reuse the PreferenceController and LayoutPreference however create
specific one for slice:
1. SlicePreference: container to inject slice view
2. SlicePreferenceController: handle updates for slice

Also add styles for it with default layout.

Bug: 120803703
Test: RunSettingsRoboTests

Change-Id: I6ab083ad57117e6198dcba37702a25213da78719
2018-12-18 14:38:25 -08:00
Fan Zhang
a122be1c35 Move non-theme styles to styles.xml
1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources

Bug: 111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a
2018-07-16 17:59:07 -07:00
Fan Zhang
1b11c68642 Remove custom style for preferenceFragmentStyle
Bug: 111454230
Test: manual
Change-Id: I84d3ba3876c636461afaeb6d77a8a759b339f733
2018-07-13 18:13:41 -07:00
Antony Sargent
212b5676d0 Remove references to SettingsBase styles
We've moved the values for several preference-related styles used in
Settings from SettingsLib into the support library. This CL removes the
references to the SettingsLib versions from Settings so they can be
removed from SettingsLib.

Also delete an unused layout file that was moved to SettingsLib a long
time ago (preference_dropdown_material_settings.xml).

Bug: 64689839
Test: visual (styles for things like icon spacing, dividers, etc. should
be the same)

Change-Id: Ib7a745218086269c2e861b18df68bd835929da19
2018-06-08 13:26:16 -07:00
Yoshinori Hirano
447192f903 Add SettingsMultiSelectListPreference style
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
2018-03-06 17:45:07 -08:00
jackqdyulei
92757b2454 Add controller for battery saver button
Bug: 72228477
Test: RunSettingsRoboTests
Change-Id: Iae9096a10553ea761d099e1e72c1de56b693bac0
2018-02-08 15:19:00 -08:00
Antony Sargent
49820f4c65 Revert "Update style names due to theme migration"
This reverts commit cc16feb726.

Reason for revert: in b/70031670 we discovered some problems in
the support library side change (ag/3136307), and it will take a
little while to fix those problems so we need to temporarily
revert the support library changes to unblock a push of the
support library to google3.

Change-Id: I2086f434d5bcb518e474734b6d2b98a4b1c194d2
2017-12-06 17:57:01 +00:00
Antony Sargent
cc16feb726 Update style names due to theme migration
This updates some theme names to go along with a change to migrate some
theme elements from SettingsLib to the support library.

Bug: 64689839
Test: manual
Change-Id: I31b96c321def78bbb49239faae6ba8e73aacd2fa
2017-11-27 18:06:48 +00: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
Fan Zhang
e67630ab16 Support multi line title for switch and edittext preferences
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix: 63509156
Test: visual
2017-07-10 19:57:58 +00:00
Fan Zhang
e1c68df27e Use framework pref layout for SwitchPreference
Test: manual
Change-Id: Id9add8d5669cbb34e93c9bfd2e25e75d9cc56a56
2017-05-06 09:43:25 -07:00
Fan Zhang
8ad5eb4894 Use preference supported attr to reserve icon space
Change-Id: I28c36f44e6db91fba9aaa5a260303c873a684a5f
Fix: 37572422
Test: runtest android.settings.functional.DisplaySettingsTest
2017-05-01 13:02:48 -07:00
Fan Zhang
04b96110e1 Revert "Use framework support to reserve icon space"
This causes DropdownPreference to crash

Bug: 37850881
This reverts commit 19f5783b75.

Change-Id: Iaa2ceb1a031e8e0b62bc886d908534f3b53d3835
2017-05-01 18:11:59 +00:00
Fan Zhang
19f5783b75 Use framework support to reserve icon space
Framework now has iconSpaceReserved attr to support reserving icon
space. We no longer need to use a custom layout for each preference.

What's removed:
- custom style for normal preference
- custom layout/style for dropdown preference
- custom style for EditTextPreference

Fix: 37572422
Test: visual
Change-Id: I48d2997e6269143f58c2edd2d9902cdc0519ed04
2017-04-25 22:07:24 +00:00
Doris Ling
aa805e70ed Allow settings preference title to span over multiple lines.
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.

Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual
2017-04-11 13:17:38 -07: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
bfb006aa32 Use framework support to customize dividers between prefs.
Bug: 33579296
Test: make RunSettingsRoboTests
Change-Id: I1bb3b82b88dc727cda05b00058e6f40564f0e5db
2017-02-27 12:47:44 -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
Fan Zhang
ec407ff78c Left align preferences and graphs to leave space for icon.
Bug: 33559277
Test: Visual inspection
Change-Id: Iacf9556826174a03b1cbf8a6f179b63d8686c5f5
2016-12-19 13:41:37 -08: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