diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 15:10:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 15:10:16 -0700 |
| commit | 402401e666b0b5068ebcb0e45d0ed9c06dd4674e (patch) | |
| tree | 2e7627378564c7e6089ca8f5b18c062f997cfb6f | |
| parent | a488c79605d0629986bb636bc2a2bc86f4947686 (diff) | |
| parent | 2dcba613a736b1c0ba2f9c18c32f171f7bbb1a23 (diff) | |
| download | frameworks_base-402401e666b0b5068ebcb0e45d0ed9c06dd4674e.zip frameworks_base-402401e666b0b5068ebcb0e45d0ed9c06dd4674e.tar.gz frameworks_base-402401e666b0b5068ebcb0e45d0ed9c06dd4674e.tar.bz2 | |
am 2dcba613: am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev
* commit '2dcba613a736b1c0ba2f9c18c32f171f7bbb1a23':
Custom pressed states, fixed column sizes.
3 files changed, 15 insertions, 15 deletions
diff --git a/packages/DocumentsUI/res/drawable/item_background.xml b/packages/DocumentsUI/res/drawable/item_background.xml index 6fcab3c..ec9be6d 100644 --- a/packages/DocumentsUI/res/drawable/item_background.xml +++ b/packages/DocumentsUI/res/drawable/item_background.xml @@ -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" /> diff --git a/packages/DocumentsUI/res/layout/item_doc_list.xml b/packages/DocumentsUI/res/layout/item_doc_list.xml index 4c5b2e3..9ba46ac 100644 --- a/packages/DocumentsUI/res/layout/item_doc_list.xml +++ b/packages/DocumentsUI/res/layout/item_doc_list.xml @@ -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" diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 59caad0..4d410d5 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -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 |