diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-17 12:48:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 12:48:55 -0700 |
| commit | e883aec0f83056f6062d663f7a1fa6884d796532 (patch) | |
| tree | 000d86cc4b114098b96059a1648f96b49f13e34b /res | |
| parent | a1eeb3e9524ba6e91c870dc6ee82ab47d82521ad (diff) | |
| parent | c999680213d843dce6309e1026f54992c07673cd (diff) | |
| download | android_packages_apps_Trebuchet-e883aec0f83056f6062d663f7a1fa6884d796532.tar.gz android_packages_apps_Trebuchet-e883aec0f83056f6062d663f7a1fa6884d796532.tar.bz2 android_packages_apps_Trebuchet-e883aec0f83056f6062d663f7a1fa6884d796532.zip | |
am c9996802: am 181a0b22: am e34a213c: Add missing layout attributes Bug #7334849
* commit 'c999680213d843dce6309e1026f54992c07673cd':
Add missing layout attributes Bug #7334849
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/workspace_cling.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/workspace_cling.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw720dp/workspace_cling.xml | 6 | ||||
| -rw-r--r-- | res/layout/custom_workspace_cling.xml | 2 |
4 files changed, 20 insertions, 0 deletions
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index b66f1bd8a..b035aa1d4 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -16,6 +16,8 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:layout_width="match_parent" + android:layout_height="match_parent" launcher:drawIdentifier="workspace_landscape"> <FrameLayout android:layout_width="match_parent" @@ -28,6 +30,8 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" @@ -46,6 +50,8 @@ android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginBottom="15dp" android:layout_marginRight="10dp" android:layout_gravity="bottom|right" diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 10e697620..738e2c571 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -16,6 +16,8 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:layout_width="match_parent" + android:layout_height="match_parent" launcher:drawIdentifier="workspace_portrait"> <FrameLayout android:layout_width="match_parent" @@ -29,6 +31,8 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" @@ -49,6 +53,8 @@ android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginBottom="15dp" android:layout_marginRight="10dp" android:layout_gravity="bottom|right" diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml index 10e697620..738e2c571 100644 --- a/res/layout-sw720dp/workspace_cling.xml +++ b/res/layout-sw720dp/workspace_cling.xml @@ -16,6 +16,8 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:layout_width="match_parent" + android:layout_height="match_parent" launcher:drawIdentifier="workspace_portrait"> <FrameLayout android:layout_width="match_parent" @@ -29,6 +31,8 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" @@ -49,6 +53,8 @@ android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginBottom="15dp" android:layout_marginRight="10dp" android:layout_gravity="bottom|right" diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml index 5bdc58719..0fdb57509 100644 --- a/res/layout/custom_workspace_cling.xml +++ b/res/layout/custom_workspace_cling.xml @@ -17,6 +17,8 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:layout_width="match_parent" + android:layout_height="match_parent" launcher:drawIdentifier="workspace_custom"> <TextView android:layout_width="wrap_content" |