summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-10-20 20:39:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 20:39:38 +0000
commitf745906adc41e846dc00ca08202347ff4bb9554b (patch)
tree9dcb014530e969b1fae261c625ca44b0d70faff4
parentda018b63f3bb618d8e363b7e8451c804e25b2637 (diff)
parentc69b92185aeb7adc57f0007f5659c531e1a8c050 (diff)
downloadandroid_packages_apps_Trebuchet-f745906adc41e846dc00ca08202347ff4bb9554b.tar.gz
android_packages_apps_Trebuchet-f745906adc41e846dc00ca08202347ff4bb9554b.tar.bz2
android_packages_apps_Trebuchet-f745906adc41e846dc00ca08202347ff4bb9554b.zip
am c69b9218: Merge "Using LinearLayout for overview panel" into ub-now-queens
* commit 'c69b92185aeb7adc57f0007f5659c531e1a8c050': Using LinearLayout for overview panel
-rw-r--r--res/layout/overview_panel.xml42
-rw-r--r--src/com/android/launcher3/Launcher.java3
2 files changed, 23 insertions, 22 deletions
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index 558900c7d..4b7423eba 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!--
+ Copyright (C) 2013 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.
@@ -13,47 +14,50 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
- android:orientation="horizontal">
+ android:gravity="top"
+ android:orientation="horizontal" >
<TextView
android:id="@+id/wallpaper_button"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_gravity="start|top"
- android:text="@string/wallpaper_button_text"
+ android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableTop="@drawable/wallpaper_button"
- android:gravity="center_horizontal"
android:fontFamily="sans-serif-condensed"
+ android:gravity="center_horizontal"
+ android:text="@string/wallpaper_button_text"
android:textAllCaps="true"
android:textSize="12sp" />
+
<TextView
android:id="@+id/widget_button"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|top"
- android:text="@string/widget_button_text"
+ android:layout_weight="1"
android:drawablePadding="4dp"
- android:gravity="center_horizontal"
android:drawableTop="@drawable/widget_button"
android:fontFamily="sans-serif-condensed"
+ android:gravity="center_horizontal"
+ android:text="@string/widget_button_text"
android:textAllCaps="true"
- android:textSize="12sp"/>
+ android:textSize="12sp" />
+
<TextView
android:id="@+id/settings_button"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_gravity="end|top"
- android:text="@string/settings_button_text"
+ android:layout_weight="1"
android:drawablePadding="4dp"
- android:gravity="center_horizontal"
android:drawableTop="@drawable/setting_button"
android:fontFamily="sans-serif-condensed"
+ android:gravity="center_horizontal"
+ android:text="@string/settings_button_text"
android:textAllCaps="true"
android:textSize="12sp" />
-</FrameLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d5cb55b03..988d5c2b9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1369,9 +1369,6 @@ public class Launcher extends Activity
settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());
} else {
settingsButton.setVisibility(View.GONE);
- FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) widgetButton.getLayoutParams();
- lp.gravity = Gravity.END | Gravity.TOP;
- widgetButton.requestLayout();
}
mOverviewPanel.setAlpha(0f);