summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2016-03-28 15:04:29 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-04-01 12:51:54 -0700
commit9a8df5bc8488c19dc0a1951cad44956894a75a09 (patch)
tree8a2de2c0b8d4337f4b3d4c664ccdca2f1d0fc22f /packages/SystemUI/res
parent16a065df515225bf4da78df7ccea63ca860b2b20 (diff)
downloadframeworks_base-9a8df5bc8488c19dc0a1951cad44956894a75a09.zip
frameworks_base-9a8df5bc8488c19dc0a1951cad44956894a75a09.tar.gz
frameworks_base-9a8df5bc8488c19dc0a1951cad44956894a75a09.tar.bz2
Implement left swipe on lockscreen
Allows user to left swipe to live lockscreen and back. Change-Id: Ia94d735695b77a091a240e13858641cf95ac0647
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/layout/keyguard_bottom_area.xml5
-rw-r--r--packages/SystemUI/res/layout/status_bar_expanded.xml4
-rw-r--r--packages/SystemUI/res/layout/unlock_fab.xml8
-rw-r--r--packages/SystemUI/res/values/cm_colors.xml3
-rw-r--r--packages/SystemUI/res/values/cm_dimens.xml3
5 files changed, 6 insertions, 17 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index afb98be..82c7965 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -19,9 +19,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
android:id="@+id/keyguard_bottom_area"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
android:outlineProvider="none"
+ android:visibility="gone"
android:elevation="5dp" > <!-- Put it above the status bar header -->
<com.android.systemui.statusbar.phone.KeyguardIndicationTextView
@@ -39,7 +40,7 @@
<FrameLayout
android:id="@+id/preview_container"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content">
</FrameLayout>
<com.android.systemui.statusbar.KeyguardAffordanceView
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 996fb71..794a755 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -94,10 +94,6 @@
</com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>
- <include
- layout="@layout/keyguard_bottom_area"
- android:visibility="gone" />
-
<include layout="@layout/status_bar_expanded_header" />
<com.android.systemui.statusbar.AlphaOptimizedView
diff --git a/packages/SystemUI/res/layout/unlock_fab.xml b/packages/SystemUI/res/layout/unlock_fab.xml
deleted file mode 100644
index c80bc19..0000000
--- a/packages/SystemUI/res/layout/unlock_fab.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/show_bouncer"
- android:layout_width="@dimen/unlock_fab_size"
- android:layout_height="@dimen/unlock_fab_size"
- android:layout_gravity="bottom|center_horizontal"
- android:alpha="0.5"
- android:src="@drawable/ic_lock_open_24dp" />
diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml
index 109b147..5b6e2c0 100644
--- a/packages/SystemUI/res/values/cm_colors.xml
+++ b/packages/SystemUI/res/values/cm_colors.xml
@@ -122,4 +122,7 @@
<color name="notification_guts_media_bg_color">#ff606060</color>
<color name="queue_background">#ff303030</color>
<color name="queue_background_pressed">#ff606060</color>
+
+ <color name="live_lockscreen_gradient_start">#00000000</color>
+ <color name="live_lockscreen_gradient_end">#66000000</color>
</resources>
diff --git a/packages/SystemUI/res/values/cm_dimens.xml b/packages/SystemUI/res/values/cm_dimens.xml
index 5e549f8..60774cd 100644
--- a/packages/SystemUI/res/values/cm_dimens.xml
+++ b/packages/SystemUI/res/values/cm_dimens.xml
@@ -53,9 +53,6 @@
<dimen name="detail_exterior_padding">8dp</dimen>
- <!-- Size of unlock FAB used when showing external keyguard views -->
- <dimen name="unlock_fab_size">48dp</dimen>
-
<dimen name="queue_row_height">52dp</dimen>
<dimen name="queue_top_shadow">3dp</dimen>
</resources>