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

Commit 39d6d965 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Make disabled items look disabled." into nyc-dev 

am: 32c90f1d

* commit '32c90f1d':
  Make disabled items look disabled.
parents bd72d129 32c90f1d

packages/DocumentsUI/res/color/item_details.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <item

        android:state_enabled="true"

        android:color="?android:attr/textColorPrimary"

        android:alpha="0.63" />

    <item

        android:state_enabled="false"

        android:color="?android:attr/textColorPrimary"

        android:alpha="0.3" />

</selector>

packages/DocumentsUI/res/color/item_title.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <item

        android:state_enabled="true"

        android:color="?android:attr/textColorPrimary" />

    <item

        android:state_enabled="false"

        android:color="?android:attr/textColorPrimary"

        android:alpha="0.3" />

</selector>

packages/DocumentsUI/res/layout/item_dir_grid.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:textColor="@*android:color/primary_text_default_material_light" />

            android:textColor="@color/item_title" />



    </LinearLayout>

packages/DocumentsUI/res/layout/item_doc_grid.xml

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:textColor="@*android:color/primary_text_default_material_light" />

            android:textColor="@color/item_title" />



        <TextView

            android:id="@+id/size"
@@ -106,7 +106,7 @@ 
            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Caption"

            android:textColor="@*android:color/primary_text_default_material_light" />

            android:textColor="@color/item_details" />



        <TextView

            android:id="@+id/date"
@@ -118,7 +118,7 @@ 
            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Caption"

            android:textColor="@*android:color/primary_text_default_material_light" />

            android:textColor="@color/item_details" />



    </RelativeLayout>

packages/DocumentsUI/res/layout/item_doc_list.xml

+7 −7
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
                android:singleLine="true"

                android:textAlignment="viewStart"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead"

                android:textColor="?android:attr/textColorPrimary" />

                android:textColor="@color/item_title" />



            <LinearLayout

                android:id="@+id/line2"
@@ -102,8 +102,8 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Body1"

                    android:textColor="?android:attr/textColorSecondary" />

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"

                    android:textColor="@color/item_details" />



                <TextView

                    android:id="@+id/size"
@@ -113,8 +113,8 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Body1"

                    android:textColor="?android:attr/textColorSecondary" />

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"

                    android:textColor="@color/item_details" />



                <TextView

                    android:id="@android:id/summary"
@@ -125,8 +125,8 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Body1"

                    android:textColor="?android:attr/textColorSecondary" />

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"

                    android:textColor="@color/item_details" />

            </LinearLayout>

        </LinearLayout>

    </LinearLayout>