Commit Graph

13 Commits

Author SHA1 Message Date
Aurimas Liutikas
fd52c1433c Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
2018-04-20 12:48:23 -07:00
yuemingw
1177b369e5 Show dynamic subtext for RestrictedSwitchPreference.
Show dynamic subtext for RestrictedSwitchPreference when corresponding
restriction is on according to the current settings status controlled
by this RestrictedSwitchPreference. I.e., show "enabled by admin"
when corresponding setting is currently turned on by admin, or
"disabled by admin". In the past, this string is hard coded in xml and
the subtext of RestrictedSwitchPreference always shows one of
"enabled by admin" and "disabled by admin" regardless of the current
status of the setting.

Bug: 73811933
Test: manually by TestDPC
Change-Id: I2bbeee14e650b288d71f6aa59fc63dd78e18d49e
2018-03-27 18:06:07 +00:00
Alan Viverette
c6b34c6aed DO NOT MERGE Clean up SettingsLib dependencies
v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds

Bug: 73250914
Bug: 74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b
2018-03-24 00:27:39 +00:00
Sudheer Shanka
df9ecfc587 Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev 2016-04-20 18:04:14 +00:00
Sudheer Shanka
a1790c3b35 Add restrictedSwitchSummary attribute to restricted switch preferences.
Bug: 27659072
Change-Id: If516adaed041ea0d66945ebf1dbe7945331d0da5
2016-04-19 21:51:38 -07:00
Sudheer Shanka
8f182f1454 Fix additional summary of RestrictedSwitchPreference.
Bug: 27659072
Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490
2016-04-19 17:27:52 -07:00
Adam Lesinski
0b1a203830 Merge "SettingsLib: Build with AAPT2" into nyc-dev 2016-04-16 07:01:08 +00:00
Adam Lesinski
5ff3ad6312 SettingsLib: Build with AAPT2
Bug:22775504
Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3
2016-04-14 14:45:21 -07:00
Sudheer Shanka
6823a8fc59 Update RestrictedSwitchPreference to have an additional summary.
Bug: 27659072
Change-Id: Idfefe16f709d092355ce9cfbd820aacf12b95692
2016-04-14 12:24:23 -07:00
Sudheer Shanka
923bc74c92 Part1: Show the restricted lock icon in place of the pref widget.
Add summary strings used for switch prefs if disabled by admin.

Bug: 25603665
Bug: 27263775
Change-Id: I88c2dd2e024f92da107bedc645641e285796d51f
2016-03-01 16:45:03 -08:00
Sudheer Shanka
1450173034 Add support for adding preference summary when disabled by admin.
Change-Id: I455c3180266734fa4ba6b5bf7cb5fc2f34177759
2016-01-25 22:40:10 +00:00
Sudheer Shanka
ea088af5c1 Made changes to padlock support for preferences.
- Currently, if a preference is disabled by admin, we add a padlock and disable
the preference. And now if the preference is enabled in some other place, the
padlock is not removed. Updated RestrictedPreference to fix this
behavior.
- Made RestrictedPreferenceHelper and
RestrictedPreferenceHelper.onAttachedToHierarchy public so that preferences in
Settings can use these.
- Put a check for null to avoid NullPointerException.
- Removed a redundant statement.

Change-Id: Ie88a761dc38c58a680c62b3703d2081c67462079
2016-01-14 16:25:56 +00:00
Sudheer Shanka
7ff866d286 Move restricted padlock support to SettingsLib
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4
2016-01-12 18:14:24 +00:00