summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
AgeCommit message (Collapse)Author
2019-06-19Change InputMethodPreference icon sizeRaff Tsai
Test: manual Fixes: 134406100 Change-Id: I7107eec598375cece7708001799f0c2c2592d4b5
2018-08-28Sort importsFan Zhang
Having consistent import order will reduce chance of merge conflict between internal and external master Test: rebuild Change-Id: I9acb311ec05f72f0a37f08b0d26785841fe91de5
2018-04-20Migrated SystemUI & SettingsLib to androidxAurimas Liutikas
Test: make SystemUI SettingsLib Bug:76692459 Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
2018-03-27Show dynamic subtext for RestrictedSwitchPreference.yuemingw
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-24DO NOT MERGE Clean up SettingsLib dependenciesAlan Viverette
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
2016-04-20Merge "Add restrictedSwitchSummary attribute to restricted switch ↵Sudheer Shanka
preferences." into nyc-dev
2016-04-19Add restrictedSwitchSummary attribute to restricted switch preferences.Sudheer Shanka
Bug: 27659072 Change-Id: If516adaed041ea0d66945ebf1dbe7945331d0da5
2016-04-19Fix additional summary of RestrictedSwitchPreference.Sudheer Shanka
Bug: 27659072 Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490
2016-04-16Merge "SettingsLib: Build with AAPT2" into nyc-devAdam Lesinski
2016-04-14SettingsLib: Build with AAPT2Adam Lesinski
Bug:22775504 Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3
2016-04-14Update RestrictedSwitchPreference to have an additional summary.Sudheer Shanka
Bug: 27659072 Change-Id: Idfefe16f709d092355ce9cfbd820aacf12b95692
2016-03-01Part1: Show the restricted lock icon in place of the pref widget.Sudheer Shanka
Add summary strings used for switch prefs if disabled by admin. Bug: 25603665 Bug: 27263775 Change-Id: I88c2dd2e024f92da107bedc645641e285796d51f
2016-01-25Add support for adding preference summary when disabled by admin.Sudheer Shanka
Change-Id: I455c3180266734fa4ba6b5bf7cb5fc2f34177759
2016-01-14Made changes to padlock support for preferences.Sudheer Shanka
- 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-12Move restricted padlock support to SettingsLibSudheer Shanka
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4