diff options
author | Danesh Mondegarian <daneshm90@gmail.com> | 2014-02-02 02:11:28 -0800 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-02-05 02:16:38 +0000 |
commit | 20109c489eed6e97803ed5e5745c8c377b0446cb (patch) | |
tree | 519756c82c1260c1d7eb2b9b7f11880478ae3fd2 /res | |
parent | dc6e2bafb333b4c0d6311d9c225374f403d105c5 (diff) | |
download | android_packages_apps_Trebuchet-20109c489eed6e97803ed5e5745c8c377b0446cb.tar.gz android_packages_apps_Trebuchet-20109c489eed6e97803ed5e5745c8c377b0446cb.tar.bz2 android_packages_apps_Trebuchet-20109c489eed6e97803ed5e5745c8c377b0446cb.zip |
Trebuchet : Show cling for allapps overview
This patchset adds a cling for the all apps indicator overview mode
as by default it is not very discoverable.
PS4: Strings + fixes
Change-Id: If7e91a0e123c0fbc4d4f4ed6ef35c1ff7b1abfb1
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/all_apps_cling.xml | 42 | ||||
-rw-r--r-- | res/layout-port/all_apps_cling.xml | 51 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout-sw600dp-port/all_apps_cling.xml | 50 | ||||
-rw-r--r-- | res/layout-sw720dp/all_apps_cling.xml | 46 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 5 |
6 files changed, 74 insertions, 126 deletions
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml index 820f00a6d..19a93a5f3 100644 --- a/res/layout-land/all_apps_cling.xml +++ b/res/layout-land/all_apps_cling.xml @@ -16,33 +16,49 @@ <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" - launcher:drawIdentifier="all_apps_landscape"> + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="all_apps"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="40dp" - android:layout_marginTop="40dp"> + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="310dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="top" android:orientation="vertical"> - <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" + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> + 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> </LinearLayout> </FrameLayout> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" + android:layout_marginEnd="20dp" android:layout_gravity="bottom|end" android:onClick="dismissAllAppsCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index 62284ec73..ed99d78a0 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/all_apps_cling.xml @@ -16,33 +16,50 @@ <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" - launcher:drawIdentifier="all_apps_portrait"> + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="all_apps"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> + android:layout_height="match_parent"> <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"> - <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" + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> + 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> </LinearLayout> </FrameLayout> + <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" - android:layout_gravity="bottom|end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="60dp" + android:layout_marginRight="20dp" + android:layout_gravity="bottom|right" android:onClick="dismissAllAppsCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 11f74ba1d..98cd0f3b6 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -99,6 +99,12 @@ 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" /> diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml deleted file mode 100644 index cf65e410d..000000000 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<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" - launcher:drawIdentifier="all_apps_portrait"> - <FrameLayout - android:layout_width="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:orientation="vertical"> - <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:text="@string/all_apps_cling_add_item" /> - </LinearLayout> - </FrameLayout> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:minWidth="168dp" - android:textSize="24sp" - android:layout_marginTop="235dp" - android:layout_marginEnd="36dp" - android:layout_gravity="top|end" - android:onClick="dismissAllAppsCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml deleted file mode 100644 index 824d84f0d..000000000 --- a/res/layout-sw720dp/all_apps_cling.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<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" - launcher:drawIdentifier="all_apps_large"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/cling_text_block_offset_x" - android:layout_marginTop="@dimen/cling_text_block_offset_y"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <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:text="@string/all_apps_cling_add_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="15dp" - android:onClick="dismissAllAppsCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index f2cb2f5cf..54e5d8254 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -76,4 +76,9 @@ <!-- Folder titles --> <string name="google_title" translatable="false">Google</string> + + <!-- The title text for the all apps cling [CHAR_LIMIT=60] --> + <string name="all_apps_cling_cm">Customize your drawer</string> + <!-- The description of how to access Trebuchet settings [CHAR_LIMIT=160] --> + <string name="all_apps_cling_summary">Tap the page indicator to view additional configuration settings</string> </resources> |