diff options
author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-04 17:53:41 +0000 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:03:27 -0700 |
commit | d90bcfe751dc99b4712a883206bf2a164af8f6c4 (patch) | |
tree | 5dbb5df14c93f76d7129e214b586857654aed9c1 /res/layout-port | |
parent | 129b7163fc3d3df45e2ba76794d6184454431963 (diff) | |
download | android_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-port')
-rw-r--r-- | res/layout-port/all_apps_cling.xml | 51 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 |
2 files changed, 17 insertions, 40 deletions
diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index ed99d78a0..62284ec73 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/all_apps_cling.xml @@ -16,50 +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_portrait"> <FrameLayout - android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" - android:layout_marginTop="30dp" android:orientation="vertical"> - <LinearLayout - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:layout_width="match_parent" + <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="285dp" 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:layout_marginBottom="60dp" - android:layout_marginRight="20dp" - android:layout_gravity="bottom|right" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginEnd="10dp" + android:layout_gravity="bottom|end" android:onClick="dismissAllAppsCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 98cd0f3b6..11f74ba1d 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -99,12 +99,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" /> |