openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Using LinearLayout for overview panel" into ub-now-queens

This commit is contained in:
Sunny Goyal 2014-10-20 20:35:32 +00:00 committed by Android (Google) Code Review
parent 3a5a9d18da e0987c5c40
commit c69b92185a
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
res/layout/overview_panel.xml
View File

@ -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:textAllCaps="true"
android:textSize="12sp"/>
<TextView
android:id="@+id/settings_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|top"
android:text="@string/settings_button_text"
android:drawablePadding="4dp"
android:gravity="center_horizontal"
android:drawableTop="@drawable/setting_button"
android:fontFamily="sans-serif-condensed"
android:text="@string/widget_button_text"
android:textAllCaps="true"
android:textSize="12sp" />
</FrameLayout>
<TextView
android:id="@+id/settings_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
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" />
</LinearLayout>

3
src/com/android/launcher3/Launcher.java
View File

@ -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);