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

Commit 4ea70470 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release-40... 

release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release-4040405 snap-temp-L68200000067456736

Change-Id: I90e2ee4491b554072cd88a4c85165bfcd744b88d
parents 7d0d84ef be39d577

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".search2.SearchActivity"

        <activity android:name=".search.SearchActivity"

                  android:label="@string/search_settings"

                  android:icon="@drawable/ic_search_history"

                  android:parentActivityName="Settings">
@@ -2894,7 +2894,7 @@ 
                <action android:name="android.settings.HOME_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="130">

            <intent-filter android:priority="120">

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

res/layout/dashboard_tile.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        android:layout_width="@dimen/dashboard_tile_image_size"

        android:layout_height="@dimen/dashboard_tile_image_size"

        android:scaleType="centerInside"

        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"

        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />

        android:layout_marginStart="@dimen/dashboard_tile_image_margin"

        android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />



    <LinearLayout

        android:layout_width="match_parent"
@@ -53,7 +53,7 @@ 
            android:textColor="?android:attr/textColorSecondary"

            android:maxLines="1"

            android:ellipsize="end"

            android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />

            android:paddingEnd="@dimen/dashboard_tile_image_margin" />



    </LinearLayout>

res/layout/search_icon_view.xml

+8 −16
Original line number Diff line number Diff line
@@ -14,20 +14,12 @@ 
  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<LinearLayout



<ImageView

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

    android:id="@+id/icon_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="56dp"

    android:gravity="center_horizontal|top"

    android:orientation="horizontal"

    android:paddingEnd="12dp"

    android:paddingTop="4dp"

    android:paddingBottom="4dp">

    <com.android.internal.widget.PreferenceImageView

    android:id="@android:id/icon"

        android:layout_width="36dp"

        android:layout_height="36dp"

        android:scaleType="fitCenter"/>

</LinearLayout>
 
 No newline at end of file
 
    android:layout_width="@dimen/dashboard_tile_image_size"

    android:layout_height="match_parent"

    android:scaleType="centerInside"

    android:layout_marginStart="@dimen/dashboard_tile_image_margin"

    android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />

res/layout/search_inline_switch_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">

res/layout/search_intent_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">