OSDN Git Service

Refactor the layout for MasterSwitch to a 2 target pref
authorFan Zhang <zhfan@google.com>
Wed, 22 Mar 2017 18:43:22 +0000 (11:43 -0700)
committerFan Zhang <zhfan@google.com>
Wed, 22 Mar 2017 23:03:40 +0000 (16:03 -0700)
commitfe292515d88e803057a5b6077f67ce284b595d7a
tree8b8c19f3a3bfe6eefbc763beb57c1de971ba1361
parent679ed4c30c19cf67fcb406339ae99f637bb91887
Refactor the layout for MasterSwitch to a 2 target pref

And move the layout to settingslib.

The new TwoTargetPreference is a preference object that has a vertical
divider between main panel and widget (if it exists).

Converted master switch, restricted preference, gear preference to use
the new style

Change-Id: Ia3848cebb06b8edc4e60abf9b0caf13cdb29c22c
Fix: 36511169
Test: make RunSettingsRoboTests
AndroidManifest.xml
res/layout/preference_master_switch.xml [deleted file]
res/layout/preference_widget_gear.xml [new file with mode: 0644]
res/layout/preference_widget_master_switch.xml
res/layout/preference_widget_settings.xml [deleted file]
src/com/android/settings/inputmethod/SpellCheckerPreference.java
src/com/android/settings/nfc/NfcPaymentPreference.java
src/com/android/settings/widget/GearPreference.java
src/com/android/settings/widget/MasterSwitchPreference.java
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java