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

Commit 31c24639 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PM] Add layout attritbutes in layout and remove styles" into main

parents 1724b4ea 66d2d378

packages/PackageInstaller/res/layout/app_snippet_layout.xml

+5 −3
Original line number Diff line number Diff line
@@ -20,15 +20,17 @@ 
    android:id="@+id/app_snippet"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:layout_marginTop="@dimen/app_snippet_layout_vertical_margin"

    android:orientation="horizontal"

    android:visibility="gone"

    style="@style/Widget.PackageInstaller.ViewGroup.AppSnippet">

    android:visibility="gone">



    <ImageView

        android:id="@+id/app_icon"

        android:layout_width="@dimen/app_snippet_icon_dimen"

        android:layout_height="@dimen/app_snippet_icon_dimen"

        style="@style/Widget.PackageInstaller.ImageView.AppIcon"/>

        android:layout_marginEnd="@dimen/app_icon_margin"

        android:layout_marginVertical="@dimen/app_icon_margin" />



    <TextView

        android:id="@+id/app_label"

packages/PackageInstaller/res/layout/install_blocked_custom_title_layout.xml

+5 −3
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ 
    android:id="@+id/customTitle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:orientation="vertical"

    style="@style/Widget.PackageInstaller.ViewGroup.CustomTitle">

    android:paddingTop="@dimen/alert_dialog_inner_padding">



    <ImageView

        android:layout_width="@dimen/lock_icon_dimen"
@@ -31,7 +32,8 @@ 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/title_install_failed_blocked"

        style="@style/Widget.PackageInstaller.WindowTitle.Custom"/>

        android:gravity="center"

        android:layout_marginTop="16dp"

        android:text="@string/title_install_failed_blocked" />



</LinearLayout>

packages/PackageInstaller/res/layout/install_fragment_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        android:id="@+id/custom_message"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/dialog_inter_element_margin"

        android:visibility="gone" />



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

packages/PackageInstaller/res/layout/keep_data_option_layout.xml

+5 −5
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ 


<LinearLayout

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

    android:id="@+id/keep_data_layout"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:id="@+id/keep_data_layout"

    android:layout_marginTop="@dimen/dialog_inter_element_margin"

    android:orientation="horizontal"

    android:visibility="gone"

    style="@style/Widget.PackageInstaller.ViewGroup.KeepData">

    android:visibility="gone" >



    <CheckBox

        style="@style/Widget.PackageInstaller.CheckBox"

        android:id="@+id/keep_data_checkbox"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content" />

        android:layout_width="wrap_content"

        android:layout_margin="@dimen/checkbox_margin" />



    <LinearLayout

        android:layout_height="wrap_content"

packages/PackageInstaller/res/values/styles.xml

+0 −33
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
        <item name="android:background">@null</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

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

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



    </style>



    <style name="Widget.PackageInstaller.Button.Colored" parent="android:Widget.DeviceDefault.Button.Colored">
@@ -42,7 +40,6 @@ 
        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">24dp</item>

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

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

    </style>



    <style name="Widget.PackageInstaller.Button.Outlined" parent="android:Widget.DeviceDefault.Button.Colored">
@@ -50,7 +47,6 @@ 
        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

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

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

    </style>



   <style name="Widget.PackageInstaller.ButtonBar" parent="">
@@ -65,26 +61,6 @@ 
        <item name="android:autoSizeTextType">uniform</item>

    </style>



    <style name="Widget.PackageInstaller.WindowTitle.Custom">

        <item name="android:gravity">center</item>

        <item name="android:layout_marginTop">16dp</item>

    </style>



    <style name="Widget.PackageInstaller.ViewGroup.AppSnippet" parent="">

        <item name="android:layout_marginTop">@dimen/app_snippet_layout_vertical_margin</item>

        <item name="android:gravity">center</item>

    </style>



    <style name="Widget.PackageInstaller.ViewGroup.CustomTitle" parent="">

        <item name="android:paddingTop">@dimen/alert_dialog_inner_padding</item>

        <item name="android:gravity">center</item>

    </style>



    <style name="Widget.PackageInstaller.ImageView.AppIcon" parent="">

        <item name="android:layout_marginVertical">@dimen/app_icon_margin</item>

        <item name="android:layout_marginRight">@dimen/app_icon_margin</item>

    </style>



    <style name="Widget.PackageInstaller.TextView.AppLabel" parent="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle">

        <item name="android:textFontWeight">600</item>

        <item name="android:color">?android:attr/textColorPrimary</item>
@@ -92,15 +68,6 @@ 


    <style name="Widget.PackageInstaller.TextView.CustomMessage" parent="@android:style/TextAppearance.DeviceDefault.Small">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:layout_marginTop">@dimen/dialog_inter_element_margin</item>

    </style>



    <style name="Widget.PackageInstaller.ViewGroup.KeepData" parent="">

        <item name="android:layout_marginTop">@dimen/dialog_inter_element_margin</item>

    </style>



    <style name="Widget.PackageInstaller.CheckBox" parent = "">

        <item name="android:layout_margin">@dimen/checkbox_margin</item>

    </style>



    <style name="Widget.PackageInstaller.TextView.KeepData.Heading" parent="@android:style/TextAppearance.DeviceDefault.Small">