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

Commit 0bae5b22 authored by Yura's avatar Yura Committed by Android (Google) Code Review
Browse files

Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit

parents 872e70e0 f0efa2fb

res/layout-port/search_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:background="@drawable/search_frame">

   <!-- Global search icon -->

   <com.android.launcher3.HolographicLinearLayout

        style="@style/SearchButton"

        style="@style/SearchButton.WithPaddingStart"

        launcher:sourceImageViewId="@+id/search_button"

        android:id="@+id/search_button_container"

        android:layout_width="match_parent"
@@ -31,7 +31,6 @@ 
        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@+id/voice_button_container"

        android:paddingStart="8dp"

        android:onClick="onClickSearchButton"

        android:focusable="true"

        android:clickable="true"
@@ -57,6 +56,7 @@ 
        android:layout_centerVertical="true"

        android:layout_alignParentEnd="true"

        android:paddingEnd="8dp"

        android:paddingRight="8dp"

        android:onClick="onClickVoiceButton"

        android:focusable="true"

        android:clickable="true"

res/layout-sw720dp/search_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:background="@drawable/search_frame">

   <!-- Global search icon -->

   <com.android.launcher3.HolographicLinearLayout

        style="@style/SearchButton"

        style="@style/SearchButton.WithPaddingStart"

        launcher:sourceImageViewId="@+id/search_button"

        android:id="@+id/search_button_container"

        android:layout_width="match_parent"
@@ -29,7 +29,6 @@ 
        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@+id/voice_button_container"

        android:paddingStart="8dp"

        android:onClick="onClickSearchButton"

        android:focusable="true"

        android:clickable="true"
@@ -55,6 +54,7 @@ 
        android:layout_centerVertical="true"

        android:layout_alignParentEnd="true"

        android:paddingEnd="8dp"

        android:paddingRight="8dp"

        android:onClick="onClickVoiceButton"

        android:focusable="true"

        android:clickable="true"

res/layout/apps_customize_widget.xml

+2 −1
Original line number Diff line number Diff line
@@ -28,12 +28,13 @@ 
    <!-- The preview of the widget or shortcut. -->

    <com.android.launcher3.PagedViewWidgetImageView

        android:id="@+id/widget_preview"

        style="@style/PagedViewWidgetImageView"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="@dimen/app_widget_preview_padding_top"

        android:paddingStart="@dimen/app_widget_preview_padding_left"

        android:paddingEnd="@dimen/app_widget_preview_padding_right"

        android:paddingRight="@dimen/app_widget_preview_padding_right"

        android:scaleType="matrix"

        android:background="@drawable/screenpanel" />

    <LinearLayout

res/values-v17/styles.xml

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

<resources>

    <style name="PagedViewWidgetImageView">

        <item name="android:paddingStart">@dimen/app_widget_preview_padding_left</item>

    </style>

    <style name="SearchButton.WithPaddingStart">

        <item name="android:paddingStart">8dp</item>

    </style>

</resources>

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -155,4 +155,10 @@ 
    </style>

    <style name="CustomClingText">

    </style>

    <style name="PagedViewWidgetImageView">

        <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item>

    </style>

    <style name="SearchButton.WithPaddingStart">

        <item name="android:paddingLeft">8dp</item>

    </style>

</resources>