diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 14:44:56 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 14:48:08 -0700 |
| commit | ca25db0cb3d6b9686a42c9cb99d90dc095f20cd8 (patch) | |
| tree | e244e3610dc32c6a3b9413f57b6e30dffc88776a /packages/DocumentsUI | |
| parent | 9095c5a8236957e677b2b13e42aad71a5b185e4d (diff) | |
| download | frameworks_base-ca25db0cb3d6b9686a42c9cb99d90dc095f20cd8.zip frameworks_base-ca25db0cb3d6b9686a42c9cb99d90dc095f20cd8.tar.gz frameworks_base-ca25db0cb3d6b9686a42c9cb99d90dc095f20cd8.tar.bz2 | |
Custom pressed states, fixed column sizes.
Use custom pressed state assets. Use fixed column sizes to prevent
truncating of long dates on small screens.
Also tear down any active CAB when switching fragments.
Bug: 11032418, 11028212
Change-Id: I2bf3dc3f693319b4b55cc901ed460f60faceba35
Diffstat (limited to 'packages/DocumentsUI')
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 |