Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 814f1eb8 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Initial changes to support predicted apps." into ub-launcher3-burnaby

parents 1d7a5566 4ac30068

res/layout/apps_grid_row_icon_view.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="left|center_vertical"

    android:layout_gravity="left|center_vertical"

    android:paddingTop="8dp"

    android:paddingTop="@dimen/apps_icon_top_bottom_padding"

    android:paddingBottom="8dp"

    android:paddingBottom="@dimen/apps_icon_top_bottom_padding"

    android:focusable="true"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    android:background="@drawable/focusable_view_bg"

    launcher:deferShadowGeneration="true" />

    launcher:deferShadowGeneration="true" />

res/layout/apps_list_row_icon_view.xml

deleted100644 → 0
+0 −29
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 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.BubbleTextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    style="@style/WorkspaceIcon.AppsCustomize"

    android:id="@+id/application_icon"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    launcher:iconPaddingOverride="24dp"

    launcher:textSizeOverride="16dp"

    launcher:layoutHorizontal="true"

    launcher:deferShadowGeneration="true" />

res/layout/apps_list_view.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <FrameLayout

    <FrameLayout

        android:id="@+id/header"

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="52dp"

        android:layout_height="@dimen/apps_search_bar_height"

        android:orientation="horizontal"

        android:orientation="horizontal"

        android:background="@drawable/apps_search_bg">

        android:background="@drawable/apps_search_bg">

        <LinearLayout

        <LinearLayout
@@ -39,6 +39,7 @@ 
                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="start|center_vertical"

                android:layout_gravity="start|center_vertical"

                android:layout_marginStart="4dp"

                android:paddingTop="12dp"

                android:paddingTop="12dp"

                android:paddingBottom="12dp"

                android:paddingBottom="12dp"

                android:contentDescription="@string/all_apps_button_label"

                android:contentDescription="@string/all_apps_button_label"
@@ -67,6 +68,7 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

            android:layout_gravity="end|center_vertical"

            android:layout_marginEnd="6dp"

            android:paddingTop="12dp"

            android:paddingTop="12dp"

            android:paddingBottom="12dp"

            android:paddingBottom="12dp"

            android:contentDescription="@string/apps_view_search_bar_hint"

            android:contentDescription="@string/apps_view_search_bar_hint"

res/values-sw600dp/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
    <dimen name="apps_grid_view_start_margin">64dp</dimen>

    <dimen name="apps_grid_view_start_margin">64dp</dimen>

    <dimen name="apps_view_section_text_size">26sp</dimen>

    <dimen name="apps_view_section_text_size">26sp</dimen>

    <dimen name="apps_view_row_height">76dp</dimen>

    <dimen name="apps_view_row_height">76dp</dimen>

    <dimen name="apps_icon_top_bottom_padding">12dp</dimen>





<!-- AppsCustomize -->

<!-- AppsCustomize -->

    <dimen name="widget_preview_label_margin_top">8dp</dimen>

    <dimen name="widget_preview_label_margin_top">8dp</dimen>

res/values-sw720dp/dimens.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




<resources>

<resources>

    <dimen name="app_icon_size">72dp</dimen>

    <dimen name="app_icon_size">72dp</dimen>

    <dimen name="apps_search_bar_height">56dp</dimen>

    <dimen name="apps_icon_top_bottom_padding">16dp</dimen>





<!-- QSB -->

<!-- QSB -->

    <dimen name="toolbar_button_vertical_padding">8dip</dimen>

    <dimen name="toolbar_button_vertical_padding">8dip</dimen>