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

Commit 74096fa6 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Replace SettingsSpinner with Spinner"

parents 55b80392 fa5ab2e2

res/layout/apps_filter_spinner.xml

+1 −3
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ 
    android:layout_height="wrap_content"

    android:background="@android:color/transparent">



    <com.android.settingslib.widget.settingsspinner.SettingsSpinner

    <Spinner

        android:id="@+id/filter_spinner"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:theme="@style/Widget.PopupWindow.Settings"/>



    <ImageView

res/layout/data_usage_cycles.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight">



    <com.android.settingslib.widget.settingsspinner.SettingsSpinner

    <Spinner

        android:id="@+id/cycles_spinner"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

res/layout/manage_apps_filter_spinner.xml

+1 −3
Original line number Diff line number Diff line
@@ -21,12 +21,10 @@ 
    android:layout_height="wrap_content"

    android:background="@android:color/transparent">



    <com.android.settingslib.widget.settingsspinner.SettingsSpinner

    <Spinner

        android:id="@+id/filter_spinner"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginStart="24dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:theme="@style/Widget.PopupWindow.Settings"/>

</FrameLayout>

res/layout/tare_dropdown_page.xml

+3 −4
Original line number Diff line number Diff line
@@ -6,15 +6,14 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context=".development.tare.DropdownActivity">

  <com.android.settingslib.widget.settingsspinner.SettingsSpinner

  <Spinner

      android:id="@+id/spinner"

      android:layout_width="match_parent"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      app:layout_constraintEnd_toEndOf="parent"

      app:layout_constraintStart_toStartOf="parent"

      app:layout_constraintTop_toTopOf="parent"

      android:theme="@style/Widget.PopupWindow.Settings"

      android:padding="10dp" />

      android:theme="@style/Widget.PopupWindow.Settings" />

  <FrameLayout

      android:id="@+id/frame_layout"

      android:layout_width="match_parent"

res/layout/tare_homepage.xml

+2 −1
Original line number Diff line number Diff line
@@ -60,5 +60,6 @@ 
        android:layout_height="wrap_content"

        android:layout_margin="20dp"

        android:onClick="revertSettings"

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

        android:text="@string/tare_revert"

        style="@style/ActionPrimaryButton" />

</LinearLayout>