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

Commit 402401e6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 2dcba613: am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev 

* commit '2dcba613':
  Custom pressed states, fixed column sizes.
parents a488c796 2dcba613

packages/DocumentsUI/res/drawable/item_background.xml

+8 −8
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 


    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />



    <item android:state_focused="true"   android:state_activated="true" android:drawable="@*android:drawable/list_selected_holo_light" />

    <item android:state_focused="false"  android:state_activated="true" android:drawable="@*android:drawable/list_selected_holo_light" />



    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@*android:drawable/list_selector_disabled_holo_light" />

    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@*android:drawable/list_selector_disabled_holo_light" />

    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@*android:drawable/list_selector_background_transition_holo_light" />

    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@*android:drawable/list_selector_background_transition_holo_light" />

    <item android:state_focused="true"                                                             android:drawable="@*android:drawable/list_focused_holo" />

    <item android:state_focused="true"   android:state_activated="true" android:drawable="@drawable/ic_grid_card_focused" />

    <item android:state_focused="false"  android:state_activated="true" android:drawable="@drawable/ic_grid_card_focused" />



    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/ic_grid_card_pressed" />

    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/ic_grid_card_pressed" />

    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/ic_grid_card_pressed" />

    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/ic_grid_card_pressed" />

    <item android:state_focused="true"                                                             android:drawable="@drawable/ic_grid_card_pressed" />



    <item android:drawable="@android:color/transparent" />

packages/DocumentsUI/res/layout/item_doc_list.xml

+3 −7
Original line number Diff line number Diff line
@@ -92,10 +92,8 @@ 


            <TextView

                android:id="@+id/date"

                android:layout_width="0dp"

                android:layout_width="90dp"

                android:layout_height="wrap_content"

                android:layout_weight="0.25"

                android:minWidth="70dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"
@@ -103,11 +101,9 @@ 


            <TextView

                android:id="@+id/size"

                android:layout_width="0dp"

                android:layout_width="90dp"

                android:layout_height="wrap_content"

                android:layout_weight="0.25"

                android:layout_marginStart="8dp"

                android:minWidth="70dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"
@@ -117,7 +113,7 @@ 
                android:id="@android:id/summary"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="0.5"

                android:layout_weight="1"

                android:layout_marginStart="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

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

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ public class DirectoryFragment extends Fragment { 
            final View view = target.getChildAt(i);

            mRecycleListener.onMovedToScrapHeap(view);

        }



        // Tear down any selection in progress

        mListView.setChoiceMode(AbsListView.CHOICE_MODE_NONE);

        mGridView.setChoiceMode(AbsListView.CHOICE_MODE_NONE);

    }



    @Override