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

Commit ebbea789 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev

parents e07f357c 325a0b04

core/res/res/layout/autofill_save.xml

+62 −79
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 


<LinearLayout

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

    android:id="@+id/autofill_save"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"
@@ -65,23 +60,13 @@ 


        </LinearLayout>



	    <!-- TODO(b/62534917) wrap content to fit exactly what was provided in the remote views ?-->

            <LinearLayout

        <com.android.server.autofill.ui.CustomScrollView

            android:id="@+id/autofill_save_custom_subtitle"

                android:layout_width="fill_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:orientation="horizontal"

            android:layout_marginTop="4dp"

            android:visibility="gone"/>



            <TextView

                android:id="@+id/autofill_save_subtitle"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="4dp"

                android:visibility="gone">

            </TextView>



    </LinearLayout>



    <com.android.internal.widget.ButtonBarLayout
@@ -120,5 +105,3 @@ 
    </com.android.internal.widget.ButtonBarLayout>



</LinearLayout>
 


</LinearLayout>

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ 
        <!-- Max height of the autofill data set picker as a fraction of the screen height -->

        <attr name="autofillDatasetPickerMaxHeight" format="reference" />



        <!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height -->

        <attr name="autofillSaveCustomSubtitleMaxHeight" format="reference" />



        <!-- Default disabled alpha for widgets that set enabled/disabled alpha programmatically. -->

        <attr name="disabledAlpha" format="float" />

        <!-- The alpha applied to the foreground color to create the primary text color. -->

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -595,4 +595,7 @@ 
    <!-- Max width/height of the autofill data set picker as a fraction of the screen width/height -->

    <dimen name="autofill_dataset_picker_max_size">90%</dimen>



    <!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height -->

    <dimen name="autofill_save_custom_subtitle_max_height">20%</dimen>



</resources>

core/res/res/values/symbols.xml

+2 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 
  <java-symbol type="attr" name="autofilledHighlight"/>

  <java-symbol type="attr" name="autofillDatasetPickerMaxWidth"/>

  <java-symbol type="attr" name="autofillDatasetPickerMaxHeight"/>

  <java-symbol type="attr" name="autofillSaveCustomSubtitleMaxHeight"/>

  <java-symbol type="bool" name="action_bar_embed_tabs" />

  <java-symbol type="bool" name="action_bar_expanded_action_views_exclusive" />

  <java-symbol type="bool" name="config_avoidGfxAccel" />
@@ -2896,7 +2897,6 @@ 
  <java-symbol type="id" name="autofill" />

  <java-symbol type="id" name="autofill_save_custom_subtitle" />

  <java-symbol type="id" name="autofill_save_title" />

  <java-symbol type="id" name="autofill_save_subtitle" />

  <java-symbol type="id" name="autofill_save_no" />

  <java-symbol type="id" name="autofill_save_yes" />

  <java-symbol type="id" name="autofill_save_close" />
@@ -2920,6 +2920,7 @@ 
  <java-symbol type="drawable" name="autofill_dataset_picker_background" />

  <java-symbol type="style" name="AutofillDatasetPicker" />

  <java-symbol type="dimen" name="autofill_dataset_picker_max_size"/>

  <java-symbol type="dimen" name="autofill_save_custom_subtitle_max_height"/>



  <java-symbol type="dimen" name="notification_big_picture_max_height"/>

  <java-symbol type="dimen" name="notification_big_picture_max_width"/>

core/res/res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -453,6 +453,9 @@ please see themes_device_defaults.xml. 
        <!-- Autofill: max width/height of the dataset picker as a fraction of screen size -->

        <item name="autofillDatasetPickerMaxWidth">@dimen/autofill_dataset_picker_max_size</item>

        <item name="autofillDatasetPickerMaxHeight">@dimen/autofill_dataset_picker_max_size</item>



        <!-- Autofill: max height of custom save subtitle as a fraction of screen size -->

        <item name="autofillSaveCustomSubtitleMaxHeight">@dimen/autofill_save_custom_subtitle_max_height</item>

    </style>



    <!-- Variant of {@link #Theme} with no title bar -->