summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2014-06-04 17:53:41 +0000
committerDanesh M <daneshm90@gmail.com>2014-06-05 23:03:27 -0700
commitd90bcfe751dc99b4712a883206bf2a164af8f6c4 (patch)
tree5dbb5df14c93f76d7129e214b586857654aed9c1 /res/layout-land
parent129b7163fc3d3df45e2ba76794d6184454431963 (diff)
downloadandroid_packages_apps_Trebuchet-d90bcfe751dc99b4712a883206bf2a164af8f6c4.tar.gz
android_packages_apps_Trebuchet-d90bcfe751dc99b4712a883206bf2a164af8f6c4.tar.bz2
android_packages_apps_Trebuchet-d90bcfe751dc99b4712a883206bf2a164af8f6c4.zip
Revert "Trebuchet : Show cling for allapps overview"
This reverts commit 20109c489eed6e97803ed5e5745c8c377b0446cb. Change-Id: I025c038d85256e2aa8500e098646a57a2fb41d5c
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/all_apps_cling.xml42
-rw-r--r--res/layout-land/launcher.xml6
2 files changed, 13 insertions, 35 deletions
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml
index 19a93a5f3..820f00a6d 100644
--- a/res/layout-land/all_apps_cling.xml
+++ b/res/layout-land/all_apps_cling.xml
@@ -16,49 +16,33 @@
<com.android.launcher3.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:drawIdentifier="all_apps">
+ launcher:drawIdentifier="all_apps_landscape">
<FrameLayout
- android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="25dp"
- android:layout_marginEnd="25dp"
- android:layout_marginTop="310dp">
+ android:layout_marginStart="40dp"
+ android:layout_marginTop="40dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="top"
android:orientation="vertical">
- <LinearLayout
- android:paddingLeft="20dp"
- android:paddingRight="20dp"
- android:paddingTop="20dp"
- android:paddingBottom="20dp"
+ <TextView
+ style="@style/ClingTitleText"
+ android:id="@+id/all_apps_cling_title"
+ android:text="@string/all_apps_cling_title" />
+ <TextView
+ style="@style/ClingText"
+ android:id="@+id/all_apps_cling_add_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:background="@drawable/cling">
- <TextView
- style="@style/ClingTitleText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/all_apps_cling_cm" />
- <TextView
- style="@style/ClingText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/all_apps_cling_summary" />
- </LinearLayout>
+ android:text="@string/all_apps_cling_add_item" />
</LinearLayout>
</FrameLayout>
<Button
style="@style/ClingButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:id="@+id/cling_dismiss"
android:layout_marginBottom="15dp"
- android:layout_marginEnd="20dp"
+ android:layout_marginEnd="10dp"
android:layout_gravity="bottom|end"
android:onClick="dismissAllAppsCling" />
</com.android.launcher3.Cling>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 2f64efe39..3666b5986 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -94,12 +94,6 @@
android:layout_height="match_parent"
android:visibility="invisible" />
- <include layout="@layout/all_apps_cling"
- android:id="@+id/all_apps_cling"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone" />
-
<include layout="@layout/overview_panel"
android:id="@+id/overview_panel"
android:visibility="gone" />