Some fix of Simplified Chinese translations
Rebase to Vanirs PIE
Derped for now
Revert "Derped for now"

This reverts commit 578abec6362adeaf59891e408e68e453f7aa7eaa.
Fix build errors 2
Fix spelling error in Android.mk
Fix build error, reorganize PIE control, which is based off Vanir
Remove duplicate strings
Wrong package
Wrong imports
Revert "Wrong imports"

This reverts commit 8e14b0af43aa39494f32e6ad64c06947fb449f3b.
More fixes and hopefully ill fix the build
still trying to fix the build :(
Last time
Rebase to Vanirs PIE

Derped for now

Revert "Derped for now"

This reverts commit 578abec6362adeaf59891e408e68e453f7aa7eaa.

Fix build errors 2

Fix spelling error in Android.mk

Fix build error, reorganize PIE control, which is based off Vanir

Remove duplicate strings

Wrong package

Wrong imports

Revert "Wrong imports"

This reverts commit 8e14b0af43aa39494f32e6ad64c06947fb449f3b.

More fixes and hopefully ill fix the build

still trying to fix the build :(

Last time
Revert "Rebase to Vanirs PIE"

This reverts commit a7efd8e91e74778c417ae97663ff8a6129374809.
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_XYSettings into jellybean
Revert "Rebase to Vanirs PIE"

This reverts commit a7efd8e91e74778c417ae97663ff8a6129374809.
ROMControl: CustomToggle Improvements (!Advanced)

Remove advanced Preference in favor of:
        If click = null, use longclick icon.
        This is all Advanced vs Basic was, really.
        User confusion might ensue, but ultimately,
        Exact same ability if you set click to null.
        This also clarifies the ShouldCollapse
        Preference through correlation of it not
        Collapsing on-click in basic.
ROMControl:
        -If click = null send longclick text to system
        -Fix Individual Toggle Prefs showing up on
         clean flash (favorite/screenshot/custom)
        -Remove unused junk
        -CustomToggle refreshes ondemand

Change-Id: Ib3f9656e4ca67a5b62d9d8a2cba03d66088180a4
Fix build errors