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

Commit 527e6548 authored by Bill Lin's avatar Bill Lin
Browse files

Remove redundant theme resource 

After migrate androidx library
ActionBar & Toolbar theme are well defined in androidx support lib
It's not necessary to override ActionBarTheme again.

Test: atest DocumentsUITests
Change-Id: I778d7531da0cee89012eb6abc3493974eab6f4d3
Fix: 119500252
Fix: 119211828
parent b20ed181

res/values-night/styles.xml

+0 −22
Original line number Diff line number Diff line
@@ -15,28 +15,6 @@ 
-->



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

    <style name="ActionBarTheme" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">

        <item name="android:colorControlNormal">@color/g_light_grey</item>

        <item name="android:textColorHighlight">@color/text_highlight_dark</item>

        <item name="android:textColorPrimary">@color/g_light_grey</item>

        <item name="android:textColorSecondary">@color/g_light_grey</item>

        <item name="android:textColorHint">@color/text_hint_dark</item>

        <item name="android:textCursorDrawable">@drawable/text_cursor</item>

        <item name="android:titleTextStyle">@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse</item>

        <item name="android:subtitleTextStyle">@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse</item>

    </style>



    <style name="actionModeStyle" parent="Widget.AppCompat.ActionMode">

        <item name="android:background">?android:attr/actionModeBackground</item>

        <item name="android:backgroundSplit">?android:attr/actionModeBackground</item>

        <item name="android:titleTextStyle">@android:style/TextAppearance.Material.Widget.ActionMode.Title.Inverse</item>

        <item name="android:subtitleTextStyle">@android:style/TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse</item>

    </style>



    <style name="ActionBarPopupTheme" parent="@android:style/ThemeOverlay.Material.Dark" />



    <style name="ListViewStyle" parent="@android:style/Widget.Material.ListView"></style>



    <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">

        <item name="colorBackgroundFloating">@drawable/grid_item_background_dark</item>

        <item name="cardPreventCornerOverlap">false</item>

res/values-night/themes.xml

+1 −5
Original line number Diff line number Diff line
@@ -16,12 +16,8 @@ 


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

    <style name="DocumentsTheme" parent="@style/Theme.MaterialComponents.NoActionBar">

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

        <item name="actionBarTheme">@style/ActionBarTheme</item>

        <item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>

        <item name="actionModeStyle">@style/ActionModeStyle</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>



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

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

res/values/styles.xml

+0 −22
Original line number Diff line number Diff line
@@ -15,28 +15,6 @@ 
-->



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

    <style name="ActionBarTheme" parent="@android:style/ThemeOverlay.Material.ActionBar">

        <item name="android:colorControlNormal">@color/g_grey</item>

        <item name="android:textColorHighlight">@color/text_highlight</item>

        <item name="android:textColorPrimary">@color/g_grey</item>

        <item name="android:textColorSecondary">@color/text_secondary</item>

        <item name="android:textColorHint">@color/text_hint</item>

        <item name="android:textCursorDrawable">@drawable/text_cursor</item>

        <item name="android:titleTextStyle">@android:style/TextAppearance.Material.Widget.ActionBar.Title</item>

        <item name="android:subtitleTextStyle">@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle</item>

    </style>



    <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">

        <item name="android:background">?android:attr/actionModeBackground</item>

        <item name="android:backgroundSplit">?android:attr/actionModeBackground</item>

        <item name="android:titleTextStyle">@android:style/TextAppearance.Material.Widget.ActionMode.Title</item>

        <item name="android:subtitleTextStyle">@android:style/TextAppearance.Material.Widget.ActionMode.Subtitle</item>

    </style>



    <style name="ActionBarPopupTheme" parent="@android:style/ThemeOverlay.Material.Light" />



    <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView"></style>



    <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">

        <item name="colorBackgroundFloating">@drawable/grid_item_background</item>

        <item name="cardPreventCornerOverlap">false</item>

res/values/themes.xml

+1 −5
Original line number Diff line number Diff line
@@ -16,12 +16,8 @@ 


<resources>

    <style name="DocumentsTheme" parent="@style/Theme.MaterialComponents.Light.NoActionBar">

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

        <item name="actionBarTheme">@style/ActionBarTheme</item>

        <item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>

        <item name="actionModeStyle">@style/ActionModeStyle</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>



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

        <item name="colorPrimary">@android:color/white</item>

src/com/android/documentsui/inspector/InspectorActivity.java

+16 −4
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ package com.android.documentsui.inspector; 


import static androidx.core.util.Preconditions.checkArgument;



import android.app.Activity;

import android.content.Intent;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.net.Uri;

import android.os.Bundle;

import android.util.TypedValue;

import android.view.MenuItem;

import android.view.View;
@@ -85,10 +88,19 @@ public class InspectorActivity extends AppCompatActivity { 
    }



    private void initRes() {

        final Resources.Theme theme = this.getTheme();

        final TypedValue outValue = new TypedValue();

        // Resolve actionBarTheme from AppCompat theme, keep obtain textColorPrimary if found

        final boolean found = theme.resolveAttribute(R.attr.actionBarTheme, outValue, true);

        if (found) {

            TypedArray ta =

                this.obtainStyledAttributes(R.style.ActionBarTheme, R.styleable.ActionBarView);

        mTitleColor = ta.getColor(R.styleable.ActionBarView_android_textColorPrimary, Color.BLACK);

                    this.obtainStyledAttributes(outValue.data, R.styleable.ActionBarView);

            mTitleColor = ta.getColor(R.styleable.ActionBarView_android_textColorPrimary,

                    Color.BLACK);

            ta.recycle();

        } else {

            mTitleColor = Color.BLACK;

        }

    }



    @Override