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

Commit 23dd3510 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-41... 

release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087 snap-temp-L93200000081515229

Change-Id: I425665ea535380f6daf9bad74e52754b0213599e
parents 32b85264 5cc0eb16

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -807,6 +807,10 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.PERSONALIZE" />

            </intent-filter>

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

                       android:resource="@string/wallpaper_suggestion_title" />

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

res/layout-land/fingerprint_enroll_finish.xml

+75 −69
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
    android:layout="@layout/suw_glif_blank_template"

    style="?attr/fingerprint_layout_theme">



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">



        <LinearLayout

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"
@@ -44,6 +49,7 @@ 
                    style="@style/SuwGlifIcon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="?attr/suwGlifHeaderGravity"

                    android:layout_marginLeft="0dp"

                    android:layout_marginRight="0dp"

                    android:contentDescription="@null"
@@ -117,5 +123,5 @@ 
            </com.android.setupwizardlib.view.FillContentLayout>



        </LinearLayout>



    </ScrollView>

</com.android.setupwizardlib.GlifLayout>

res/layout/condition_tile_new_ui.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:id="@+id/content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:background="@color/condition_card_background"

    android:orientation="vertical">



    <LinearLayout

res/layout/preference_category_material_settings.xml

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

<!--

  Copyright (C) 2016 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.

  -->



<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml

     except that this supports icon -->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginBottom="8dp"

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



    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:orientation="horizontal">

        <com.android.internal.widget.PreferenceImageView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:tint="?android:attr/textColorPrimary"

            android:maxWidth="18dp"

            android:maxHeight="18dp"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="56dp"

        android:orientation="vertical">

        <TextView

            android:id="@android:id/title"

            android:layout_marginTop="16dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="@android:style/TextAppearance.Material.Body2"

            android:textColor="?android:attr/colorAccent"

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

        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:ellipsize="end"

            android:singleLine="true" />

    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/preference_dropdown_material_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ 
        android:layout_marginStart="@dimen/preference_no_icon_padding_start"

        android:visibility="invisible" />



    <include layout="@layout/preference_material_settings"/>

    <include layout="@layout/preference_material"/>



</FrameLayout>
 
 No newline at end of file