From 46eda4b7d523aeb4371fca3a5a9084df64254d81 Mon Sep 17 00:00:00 2001
From: DvTonder <david.vantonder@gmail.com>
Date: Sun, 2 Dec 2012 19:17:32 -0500
Subject: Settings: Forward port Slider shortcuts

Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)

Settings : Lockscreen targets alignment fix

Add separate layouts for different layouts to fix alignment issues.

Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f

Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84
---
 res/layout/lockscreen_shortcut_dialog.xml | 32 ++++++++++++++++++++
 res/layout/lockscreen_targets.xml         | 50 +++++++++++++++++++++++++++++++
 res/layout/pick_item.xml                  | 10 +++----
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 res/layout/lockscreen_shortcut_dialog.xml
 create mode 100644 res/layout/lockscreen_targets.xml

(limited to 'res/layout')

diff --git a/res/layout/lockscreen_shortcut_dialog.xml b/res/layout/lockscreen_shortcut_dialog.xml
new file mode 100644
index 0000000..638af0f
--- /dev/null
+++ b/res/layout/lockscreen_shortcut_dialog.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:paddingLeft="8dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    <ImageButton
+        android:padding="5dp"
+        android:layout_width="@android:dimen/app_icon_size"
+        style="?android:attr/borderlessButtonStyle"
+        android:id="@+id/icon"
+        android:layout_height="@android:dimen/app_icon_size" />
+    <View
+        android:layout_width="2dp"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginLeft="5dp"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <Button
+        android:layout_width="match_parent"
+        style="?android:attr/borderlessButtonStyle"
+        android:gravity="left|center_vertical"
+        android:paddingLeft="5dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/label" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/lockscreen_targets.xml b/res/layout/lockscreen_targets.xml
new file mode 100644
index 0000000..cff327c
--- /dev/null
+++ b/res/layout/lockscreen_targets.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/holo_blue_light"
+        android:layout_marginRight="8dip"
+        android:layout_marginLeft="8dip"
+        android:padding="4dip"
+        android:gravity="center_horizontal"
+        android:textColor="#FFFFFF"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/lockscreen_target_info" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.4" />
+
+    <com.android.internal.widget.multiwaveview.GlowPadView
+        android:id="@+id/lock_target"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.6"
+        android:orientation="horizontal"
+        android:gravity="top"
+        android:contentDescription="@*android:string/keyguard_accessibility_slide_area"
+        prvandroid:targetDrawables="@*android:array/lockscreen_targets_unlock_only"
+        prvandroid:targetDescriptions="@*android:array/lockscreen_target_descriptions_unlock_only"
+        prvandroid:directionDescriptions="@*android:array/lockscreen_direction_descriptions"
+        prvandroid:handleDrawable="@*android:drawable/ic_lockscreen_handle"
+        prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
+        prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius"
+        prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
+        prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"
+        prvandroid:firstItemOffset="@*android:integer/kg_glowpad_rotation_offset"
+        prvandroid:magneticTargets="false"
+        prvandroid:feedbackCount="1"
+        prvandroid:vibrationDuration="20"
+        prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"
+        prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
+        prvandroid:allowScaling="true" />
+
+</LinearLayout>
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index d85edc4..e937d7b 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -17,9 +17,9 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:textAppearance="?android:attr/textAppearanceLarge"
     android:gravity="center_vertical"
-    android:drawablePadding="8dip"
-    android:paddingStart="11dip"
-    android:paddingEnd="11dip" />
+    android:drawablePadding="14dip"
+    android:paddingLeft="15dip"
+    android:paddingRight="15dip" />
-- 
cgit v1.1