Commit Graph

13 Commits

Author SHA1 Message Date
Edgar Wang
5e5c126fd4 Update the padding of TowTargetPreference divider
Bug: 193824089
Change-Id: I33068ca3a3017d81fbd40c59b980f08e23585478
Test: visual verify
(cherry picked from commit 7feda7c8f1)
2021-08-23 17:28:52 +00:00
Edgar Wang
58c464179b Allow the title of preference display in 2 lines
After discussed with UX, we think that is necessery for localization.
So we set the max_line to 2.

Bug: 189495817
Test: change language and manual test
Change-Id: I269a22af37e9edb14de46f9ac245da07b8e2a228
2021-06-09 04:29:00 +00:00
Edgar Wang
3f66f77f61 Fix SettingsLibTwoTargetPreference broken on Android R devices
- Move new version layout to v31

Fixes: 189482683
Test: manual & CtsRoleTestCases
Change-Id: I281dbf103f32d7968e204c57bccf3038412200d7
2021-05-28 11:43:21 +08:00
Edgar Wang
ffcf3679cb Apply new style for SwitchPreference
- Moving two_target_min_width to SettingsTheme.
- Apply new Switch in SettingsTheme.

Bug: 185549116
Test: manual
Change-Id: Iae31b430728113b25f7c9055372f60ee80a6a58f
2021-05-25 23:56:12 +08:00
Edgar Wang
2d233feba8 Tweak preference layout padding
- TwoTargePreference
- WifiEntryPreference
- ZenRulePreference
- VerifiedLinksPreference

Bug: 186069482
Test: manual & robotest
Change-Id: I421159fbc056aed4b4895a30fcfcafeb1e836da3
Merged-In: I421159fbc056aed4b4895a30fcfcafeb1e836da3
2021-05-21 07:21:34 +00:00
Edgar Wang
f5098669d7 Merge "Revert "Fix highlight for RestrictedPreference"" into sc-dev 2021-05-18 09:39:53 +00:00
Edgar Wang
2f6d9a5a86 Revert "Fix highlight for RestrictedPreference"
This reverts commit 944268f2c2.

Reason for revert: Regression

Bug: 185789867

Change-Id: Ibae960a7aa076593dc57c60e13addf8b68e65dc1
2021-05-17 23:57:17 +00:00
Hai Zhang
15bfc8ac91 Add apex_available for SettingsLib libraries used by PermissionController.
Bug: 14490549
Test: presubmit
Change-Id: If7796ac8686c03b7b18017e81db8ab7fe7952ba2
2021-05-11 17:05:28 -07:00
Hai Zhang
4d01a45c44 Remove workaround for R class conflict in Settings unit test.
The workaround is accessing the resources dynamically with
Resources.getIdentifier(), however this makes it incompatible with R8
which will think the resource is unused and remove it, resulting in a
runtime exception. There is currently no way to have consumer ProGuard
texts in Soong, and we cannot disable R8 for PermissionController
because it would severely regress our APK size and make build unhappy.

The real cause for the original test failure is that, Settings unit
test used to include SettingsLib libraries in its static_libs, and
this caused duplicate R classes to be included in its test APK (which
is already in Settings APK) and resulted in the wrong R class being
loaded when accessing resources from Settings context.

So we should remove the SettingsLib dependencies in Settings unit test
and remove the workaround here, to correctly fix the issue and unblock
R8 usage.

Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: I404892ccb7c2004ec3f81df69c1dc4bceed150df
2021-05-11 01:54:37 -07:00
Jacqueline Bronger
944268f2c2 Fix highlight for RestrictedPreference
Bug: 181202172
Test: manual (phone and tv)
Change-Id: I7c0df645b5a98b3dfa2cd13c2580cea6be6f3b3d
2021-03-25 13:52:49 +00:00
Arc Wang
4dad9087ab Fix resource problem in SettingsSliderPreferenceControllerTest
Somehow Resource IDs are inconsistent between Settings and
SettingsUnitTests. This is a workaround for NotFoundException
in SettingsUnitTests.


Bug: 183340630
Test: atest SettingsSliderPreferenceControllerTest
Change-Id: I72fef4856317ebf9fb1a667ddb910878185aae39
2021-03-24 16:36:05 +08:00
Bob Badour
1bf1c4a556 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  packages/SettingsLib/TwoTargetPreference/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I12b67c8466fbb1973d6b06f40b88d4e1e88e9a91
2021-03-19 04:22:12 -07:00
Edgar Wang
506c0cfab4 Create SettingsLibTwoTargetPreference
Bug: 180156703
Test: robotest
Change-Id: I4a9958efa47ac24f88e06c8fdb1c9d0a5542e360
2021-03-17 01:27:50 +00:00