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

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

Merge "More storage UI updates." into mnc-dev

parents a4f8aae4 2597625f

res/drawable/ic_eject_24dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>

</vector>

res/drawable/ic_eject_48dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>

</vector>

res/drawable/ic_warning_24dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M2 42h44L24 4 2 42zm24,-6h-4v-4h4v4zm0,-8h-4v-8h4v8z"/>

</vector>

res/drawable/ic_warning_48dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M2 42h44L24 4 2 42zm24,-6h-4v-4h4v4zm0,-8h-4v-8h4v8z"/>

</vector>

res/layout/preference_storage_action.xml

+2 −14
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_height="match_parent"

    android:orientation="horizontal">



    <TextView

    <ImageView

        android:id="@+id/unmount"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"
@@ -29,19 +29,7 @@ 
        android:contentDescription="@string/storage_menu_unmount"

        android:layout_gravity="center"

        android:gravity="center"

        android:textSize="30sp"

        android:src="@drawable/ic_eject_24dp"

        android:background="?android:attr/selectableItemBackground" />



    <!--

    <ImageView

        android:id="@+id/eject"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingStart="16dip"

        android:paddingEnd="16dip"

        android:src="@drawable/ic_sync_green_holo"

        android:contentDescription="@string/storage_menu_eject"

        android:layout_gravity="center"

        android:background="?android:attr/selectableItemBackground" />

    -->

</LinearLayout>