Merge "refactoring "All Apps" layout into one layout"
This commit is contained in:
Michael Jurka
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
bdfa16dcf7
@@ -1,105 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 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.launcher2.AllAppsTabbed
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
|
||||
<com.android.launcher2.AllAppsBackground
|
||||
android:id="@+id/all_apps_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<RelativeLayout
|
||||
android:layout_width="700dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/tab_unselected_holo">
|
||||
<TabWidget
|
||||
android:id="@android:id/tabs"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:tabStripEnabled="false" />
|
||||
<FrameLayout
|
||||
android:id="@+id/market_info_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true">
|
||||
<com.android.launcher2.ApplicationInfoDropTarget
|
||||
android:id="@+id/all_apps_info_target"
|
||||
android:drawableRight="@drawable/ic_home_info_holo_dark"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="invisible"/>
|
||||
<TextView
|
||||
android:id="@+id/market_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:paddingRight="22dp"
|
||||
android:text="@string/market"
|
||||
android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
|
||||
android:textSize="18sp"
|
||||
android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
|
||||
android:shadowDx="0.0"
|
||||
android:shadowDy="0.0"
|
||||
android:shadowRadius="2.0" />
|
||||
</FrameLayout>
|
||||
<com.android.launcher2.DeleteZone
|
||||
android:id="@+id/all_apps_delete_zone"
|
||||
android:drawablePadding="@dimen/delete_zone_drawable_padding"
|
||||
android:drawableLeft="@drawable/delete_zone_selector"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@id/market_info_frame"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="invisible"
|
||||
android:paddingRight="22dp"
|
||||
launcher:direction="horizontal"
|
||||
|
||||
android:gravity="center"
|
||||
android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
|
||||
android:textSize="18sp"
|
||||
android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
|
||||
android:shadowDx="0.0"
|
||||
android:shadowDy="0.0"
|
||||
android:shadowRadius="2.0" />
|
||||
</RelativeLayout>
|
||||
<FrameLayout
|
||||
android:id="@android:id/tabcontent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<com.android.launcher2.AllAppsPagedView
|
||||
android:id="@+id/all_apps_paged_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
launcher:cellCountX="5"
|
||||
launcher:cellCountY="7"
|
||||
launcher:pageLayoutWidthGap="36dp"
|
||||
launcher:pageLayoutHeightGap="36dp"
|
||||
launcher:pageLayoutPaddingTop="25dp"
|
||||
launcher:pageLayoutPaddingBottom="10dp"
|
||||
launcher:pageLayoutPaddingLeft="20dp"
|
||||
launcher:pageLayoutPaddingRight="20dp">
|
||||
</com.android.launcher2.AllAppsPagedView>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</com.android.launcher2.AllAppsTabbed>
|
||||
@@ -25,7 +25,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<RelativeLayout
|
||||
android:layout_width="952dp"
|
||||
android:layout_width="@dimen/all_apps_tabbed_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/tab_unselected_holo">
|
||||
@@ -91,14 +91,14 @@
|
||||
android:id="@+id/all_apps_paged_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
launcher:cellCountX="7"
|
||||
launcher:cellCountY="5"
|
||||
launcher:pageLayoutWidthGap="36dp"
|
||||
launcher:pageLayoutHeightGap="6dp"
|
||||
launcher:pageLayoutPaddingTop="20dp"
|
||||
launcher:pageLayoutPaddingBottom="15dp"
|
||||
launcher:pageLayoutPaddingLeft="40dp"
|
||||
launcher:pageLayoutPaddingRight="40dp">
|
||||
launcher:cellCountX="@integer/all_apps_view_cellCountX"
|
||||
launcher:cellCountY="@integer/all_apps_view_cellCountY"
|
||||
launcher:pageLayoutWidthGap="@dimen/all_apps_view_pageLayoutWidthGap"
|
||||
launcher:pageLayoutHeightGap="@dimen/all_apps_view_pageLayoutHeightGap"
|
||||
launcher:pageLayoutPaddingTop="@dimen/all_apps_view_pageLayoutPaddingTop"
|
||||
launcher:pageLayoutPaddingBottom="@dimen/all_apps_view_pageLayoutPaddingBottom"
|
||||
launcher:pageLayoutPaddingLeft="@dimen/all_apps_view_pageLayoutPaddingLeft"
|
||||
launcher:pageLayoutPaddingRight="@dimen/all_apps_view_pageLayoutPaddingRight">
|
||||
</com.android.launcher2.AllAppsPagedView>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
@@ -29,4 +29,14 @@
|
||||
<dimen name="customization_drawer_content_height">420dp</dimen>
|
||||
<dimen name="customization_drawer_content_min_width">952dp</dimen>
|
||||
<dimen name="customization_drawer_tab_widget_width">952dp</dimen>
|
||||
|
||||
<dimen name="all_apps_tabbed_width">952dp</dimen>
|
||||
<integer name="all_apps_view_cellCountX">7</integer>
|
||||
<integer name="all_apps_view_cellCountY">5</integer>
|
||||
<dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutHeightGap">6dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingTop">20dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingBottom">14dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingLeft">40dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingRight">40dp</dimen>
|
||||
</resources>
|
||||
@@ -29,4 +29,14 @@
|
||||
<dimen name="customization_drawer_content_height">420dp</dimen>
|
||||
<dimen name="customization_drawer_content_min_width">640dp</dimen>
|
||||
<dimen name="customization_drawer_tab_widget_width">700dp</dimen>
|
||||
|
||||
<dimen name="all_apps_tabbed_width">700dp</dimen>
|
||||
<integer name="all_apps_view_cellCountX">5</integer>
|
||||
<integer name="all_apps_view_cellCountY">7</integer>
|
||||
<dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingBottom">10dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingLeft">20dp</dimen>
|
||||
<dimen name="all_apps_view_pageLayoutPaddingRight">20dp</dimen>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user