Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Conflicts:
	res/xml/prefs_lockscreens.xml
	src/com/aokp/romcontrol/fragments/Lockscreens.java

	new file:   res/drawable-hdpi/ic_sysbar_menu.png
	modified:   res/layout-land/lockscreen_targets.xml
	modified:   res/layout-sw600dp-land/lockscreen_targets.xml
	modified:   res/layout-sw600dp/lockscreen_targets.xml
	modified:   res/layout/lockscreen_targets.xml
	new file:   res/layout/navbar.xml
	deleted:    res/layout/navbar_item_preference.xml
	modified:   res/values-cs/strings.xml
	modified:   res/values-ja/strings.xml
	modified:   res/values/arrays.xml
	modified:   res/values/strings.xml
	deleted:    res/xml/prefs_lockscreens.xml
	modified:   res/xml/prefs_navbar.xml
	modified:   res/xml/prefs_powermenu.xml
	modified:   res/xml/prefs_ui.xml
	modified:   src/com/aokp/romcontrol/fragments/Lockscreens.java
	modified:   src/com/aokp/romcontrol/fragments/NavRingTargets.java
	modified:   src/com/aokp/romcontrol/fragments/Navbar.java
	modified:   src/com/aokp/romcontrol/fragments/UserInterface.java
	modified:   src/com/aokp/romcontrol/fragments/Vibrations.java
	deleted:    src/com/aokp/romcontrol/widgets/NavBarItemPreference.java
RC: Updated czech translation

Change-Id: I17cc2e0c2b495caadd199726a28526341a1982b3
Signed-off-by: kecinzer <kecinzer@gmail.com>
RC: Fix Spen Options resource error

Use Navbarhelpers getProperSummary Method

Change-Id: Icde487a9b0f47f4a4c13c8ea6fc60572e59532e9
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Ability to hide Volume State toggles in Power Menu (RC Part)

With the numerous ways you can change Volume States 
(tiles, toggles, NavBar, NavRing, lockscreen), some 
may want to be able to hide the toggles that are in 
the Power Menu if they aren't using them.

This also contains the string edits I've made in my other 
commit.

Patch Set 2: White Space and Formatting Fixes

Patch Set 3: Hopefully I got the formatting down this time...

Patch Set 4: Formatting
Change-Id: Ie7af1545435ff601d7f6acd022c2266365a54eea
Merge "Ability to hide Volume State toggles in Power Menu (RC Part)" into jb-mr1
Polish translation updated

It is still not a full translation, but most of it.

Patch-set 2: EOLs fixed.

Signed-off-by: utak3r <piotr.borys@gmail.com>
Change-Id: I5bfcd556ea619992f1dc3501a150594a5161ade9
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1
Merge "Polish translation updated" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1
RC New unlock logic for lockscreen

This fixes not being able to move the unlock button without
having a new one first. Still checks that we have one unlock
before saving.

Change-Id: I638e747c9ed3b5328334f281dbc8649c495f3d0b
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
ROmControl: Remove android:label from TransparencyDialog

Transparency dialog had same label as the actual General
User Interface, which was causing a duplicate(non-working)
General UI in Uri lists generated for NavBar and NavRing
custom apps when selecting ROMControl

Change-Id: I8f4dc81acff9c071b72880d1d1a5afbcde886e2e
Signed-off-by: bmc08gt <bmc08gt.teamb00sted@gmail.com>
Toggles: Add screenshot delay option

PS2: Move individual Toggle options to the bottom
PS3: Swap screenshot/fav order

Change-Id: I7c821eac230392c577051cfec47255175019701a
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Disable fast toggle if traditional/scrollable style is active

Change-Id: Ie51c96754a1f305d836d319afc0be3d191453a9a
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge "ROmControl: Remove android:label from TransparencyDialog" into jb-mr1
Updated Japanese translations

- Add missing entries
- Modify some translations

Change-Id: Ia040c62ac7319a2d67c32338158695e2461cb511
Signed-off-by: rdgate <rdgate@gmail.com>
RC: Fix accidentally amended arrays

Change-Id: I73b8adf573c9d107931623178722309e7dcd9a8f
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge "Updated Japanese translations" into jb-mr1
String Edits Part 3

I'm sure plenty of you are raging right about now...

PS2: Moar better for Jonathan <3
PS3: Well that was annoying...restored initial changes and made a few more
PS4: Missed one
PS5: Rebased
PS6: Moar edits
PS9: Bring signal title inline
PS10: minor adjustments

Change-Id: Iaea57ce6c8d4288087d52a2a19a51a1cc5896df4
Touch up toggle setup dialog

Be consistent with other dialogs in android and match their style,
also added a close button for a better UX

Change-Id: Ifca3c9456bd2c685d66a6a056fd8047752dc8d3b
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Amend singleChoiceItems where it is not a permanent/visible choice

Change-Id: I8e4541e320afbfe8a29231d96d1a1f6ac36078de
Signed-off-by: sethyx <sethyx@gmail.com>