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

Commit cf7eb0a0 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Update colors for the standalone activity of DocumentsUI."

parents 7ce4ed16 f5eb9b30

packages/DocumentsUI/res/values/colors.xml

+6 −0
Original line number Diff line number Diff line
@@ -17,8 +17,14 @@ 
<resources>

    <color name="material_grey_50">#fffafafa</color>

    <color name="material_grey_300">#ffeeeeee</color>

    <color name="material_grey_600">#ff757575</color>

    <color name="material_grey_800">#ff424242</color>

    <color name="material_blue_700">#ff1976d2</color>

    <color name="material_blue_500">#ff2196f3</color>



    <color name="directory_background">@color/material_grey_300</color>

    <color name="item_doc_grid_background">#FFFFFFFF</color>

    <color name="item_doc_grid_protect_background">#88000000</color>

    <color name="status_bar_background">@color/material_blue_700</color>

    <color name="action_mode_status_bar_background">@color/material_grey_800</color>

</resources>

packages/DocumentsUI/res/values/styles.xml

+8 −3
Original line number Diff line number Diff line
@@ -54,12 +54,17 @@ 
        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>

    </style>



    <style name="ActionModeStyle" parent="@android:style/Widget.Material.Light.ActionMode">

        <item name="android:background">@color/material_grey_600</item>

    </style>



    <style name="StandaloneTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">

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



        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>

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

        <item name="android:colorAccent">@*android:color/material_deep_teal_500</item>

        <item name="android:colorPrimaryDark">@color/status_bar_background</item>

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

        <item name="android:colorAccent">@color/material_blue_700</item>

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



        <item name="android:listDivider">@*android:drawable/list_divider_material</item>

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -605,6 +605,8 @@ public class DirectoryFragment extends Fragment { 
                if (mActionMode == null) {

                    if (DEBUG) Log.d(TAG, "Yeah. Starting action mode.");

                    mActionMode = getActivity().startActionMode(this);

                    getActivity().getWindow().setStatusBarColor(

                        getResources().getColor(R.color.action_mode_status_bar_background));

                }

                updateActionMenu();

            } else {
@@ -612,6 +614,8 @@ public class DirectoryFragment extends Fragment { 
                if (mActionMode != null) {

                    mActionMode.finish();

                }

                getActivity().getWindow().setStatusBarColor(

                    getResources().getColor(R.color.status_bar_background));

            }



            if (mActionMode != null) {