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

Commit bd54e06e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Support multi-select in storage UI."

parents 70673628 be8b12e6
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 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_activated="true"                               android:state_pressed="true" android:drawable="@*android:drawable/list_activated_holo" />
    <item android:state_activated="true"                                                            android:drawable="@*android:drawable/list_activated_holo" />
    <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:drawable="@android:color/transparent" />
</selector>
+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@
    <ListView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
        android:layout_height="match_parent"
        android:listSelector="@android:color/transparent" />

    <GridView
        android:id="@+id/grid"
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:background="?android:attr/selectableItemBackground"
        android:text="@string/btn_save"
        android:text="@string/menu_save"
        android:textAllCaps="true"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:padding="8dp" />
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/chip"
        android:foreground="?android:attr/selectableItemBackground"
        android:foreground="@drawable/item_background"
        android:duplicateParentState="true">

        <GridLayout
+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/item_background"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
Loading