Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2dcba613a736b1c0ba2f9c18c32f171f7bbb1a23':
  Custom pressed states, fixed column sizes.
This commit is contained in:
Jeff Sharkey
2013-10-04 15:10:16 -07:00
committed by Android Git Automerger
parent a488c79605 2dcba613a7
commit 402401e666
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/DocumentsUI/res/drawable/item_background.xml
View File

@@ -18,14 +18,14 @@
<item android:state_window_focused="false" android:drawable="@android:color/transparent" /> <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="true" android:state_activated="true" android:drawable="@drawable/ic_grid_card_focused" />
<item android:state_focused="false" android:state_activated="true" android:drawable="@*android:drawable/list_selected_holo_light" /> <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="@*android:drawable/list_selector_disabled_holo_light" /> <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="@*android:drawable/list_selector_disabled_holo_light" /> <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="@*android:drawable/list_selector_background_transition_holo_light" /> <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="@*android:drawable/list_selector_background_transition_holo_light" /> <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/ic_grid_card_pressed" />
<item android:state_focused="true" android:drawable="@*android:drawable/list_focused_holo" /> <item android:state_focused="true" android:drawable="@drawable/ic_grid_card_pressed" />
<item android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" />

10
packages/DocumentsUI/res/layout/item_doc_list.xml
View File

@@ -92,10 +92,8 @@
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="0dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.25"
android:minWidth="70dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAlignment="viewStart" android:textAlignment="viewStart"
@@ -103,11 +101,9 @@
<TextView <TextView
android:id="@+id/size" android:id="@+id/size"
android:layout_width="0dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:minWidth="70dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAlignment="viewStart" android:textAlignment="viewStart"
@@ -117,7 +113,7 @@
android:id="@android:id/summary" android:id="@android:id/summary"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"

4
packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
View File

@@ -216,6 +216,10 @@ public class DirectoryFragment extends Fragment {
final View view = target.getChildAt(i); final View view = target.getChildAt(i);
mRecycleListener.onMovedToScrapHeap(view); mRecycleListener.onMovedToScrapHeap(view);
} }
// Tear down any selection in progress
mListView.setChoiceMode(AbsListView.CHOICE_MODE_NONE);
mGridView.setChoiceMode(AbsListView.CHOICE_MODE_NONE);
} }
@Override @Override