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

Commit bd7c9ac6 authored by Dake Gu's avatar Dake Gu Committed by Android (Google) Code Review
Browse files

Merge "ResolverActivity: make it theme friendly and support dark theme"

parents ccef833b 05fcc010

core/res/res/layout/resolver_different_item_header.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,5 @@ 
    android:paddingEnd="16dp"

    android:paddingEnd="16dp"

    android:paddingTop="8dp"

    android:paddingTop="8dp"

    android:paddingBottom="8dp"

    android:paddingBottom="8dp"

    android:background="@color/white"

    android:elevation="8dp"

    android:elevation="8dp"

    />
 
    />

core/res/res/layout/resolver_list.xml

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

        android:layout_height="wrap_content"

        android:layout_alwaysShow="true"

        android:layout_alwaysShow="true"

        android:elevation="8dp"

        android:elevation="8dp"

        android:background="@color/white">

        android:background="?attr/colorBackgroundFloating">





        <TextView

        <TextView

            android:id="@+id/profile_button"

            android:id="@+id/profile_button"
@@ -69,7 +69,7 @@ 
        android:id="@+id/resolver_list"

        android:id="@+id/resolver_list"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:scrollbarStyle="outsideOverlay"

        android:scrollbarStyle="outsideOverlay"

        android:background="@color/white"

        android:background="?attr/colorBackgroundFloating"

        android:elevation="8dp"

        android:elevation="8dp"

        android:nestedScrollingEnabled="true"

        android:nestedScrollingEnabled="true"

        android:scrollIndicators="top|bottom"

        android:scrollIndicators="top|bottom"
@@ -78,7 +78,7 @@ 
    <TextView android:id="@+id/empty"

    <TextView android:id="@+id/empty"

              android:layout_width="match_parent"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:layout_height="wrap_content"

              android:background="@color/white"

              android:background="?attr/colorBackgroundFloating"

              android:elevation="8dp"

              android:elevation="8dp"

              android:layout_alwaysShow="true"

              android:layout_alwaysShow="true"

              android:text="@string/noApplications"

              android:text="@string/noApplications"
@@ -99,7 +99,7 @@ 
        android:orientation="horizontal"

        android:orientation="horizontal"

        android:layoutDirection="locale"

        android:layoutDirection="locale"

        android:measureWithLargestChild="true"

        android:measureWithLargestChild="true"

        android:background="@color/white"

        android:background="?attr/colorBackgroundFloating"

        android:paddingTop="8dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:paddingBottom="8dp"

        android:paddingStart="12dp"

        android:paddingStart="12dp"

core/res/res/layout/resolver_list_with_default.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alwaysShow="true"

        android:layout_alwaysShow="true"

        android:orientation="vertical"

        android:orientation="vertical"

        android:background="@color/white"

        android:background="?attr/colorBackgroundFloating"

        android:elevation="8dp">

        android:elevation="8dp">





        <LinearLayout

        <LinearLayout
@@ -111,7 +111,6 @@ 
            android:paddingBottom="8dp"

            android:paddingBottom="8dp"

            android:paddingStart="12dp"

            android:paddingStart="12dp"

            android:paddingEnd="12dp"

            android:paddingEnd="12dp"

            android:background="@color/white"

            android:elevation="8dp">

            android:elevation="8dp">





            <Button

            <Button
@@ -151,7 +150,7 @@ 
        android:id="@+id/resolver_list"

        android:id="@+id/resolver_list"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:scrollbarStyle="outsideOverlay"

        android:scrollbarStyle="outsideOverlay"

        android:background="@color/white"

        android:background="?attr/colorBackgroundFloating"

        android:elevation="8dp"

        android:elevation="8dp"

        android:nestedScrollingEnabled="true"

        android:nestedScrollingEnabled="true"

        android:divider="@null" />

        android:divider="@null" />

core/res/res/values-television/themes_device_defaults.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,4 +18,5 @@ 
    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.Material.Autofill" />

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.Material.Autofill" />

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.Material.Autofill.Save" />

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.Material.Autofill.Save" />

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Leanback.Resolver" />

</resources>
 
</resources>

core/res/res/values/themes_leanback.xml

+37 −0
Original line number Original line Diff line number Diff line
@@ -93,4 +93,41 @@ 
        <item name="textColorPrimary">@color/primary_text_leanback_formwizard_dark</item>

        <item name="textColorPrimary">@color/primary_text_leanback_formwizard_dark</item>

        <item name="windowAnimationStyle">@style/WindowAnimationStyle.Leanback.Setup</item>

        <item name="windowAnimationStyle">@style/WindowAnimationStyle.Leanback.Setup</item>

    </style>

    </style>



    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.Leanback.Resolver" parent="Theme.Material">

        <item name="windowEnterTransition">@empty</item>

        <item name="windowExitTransition">@empty</item>

        <item name="windowIsTranslucent">true</item>

        <item name="windowNoTitle">true</item>

        <item name="windowBackground">@color/transparent</item>

        <item name="backgroundDimEnabled">true</item>

        <item name="statusBarColor">@color/transparent</item>

        <item name="windowContentOverlay">@null</item>

        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>

        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

        <item name="colorError">@color/error_color_device_default_dark</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>

      </style>



</resources>
 
</resources>