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

Commit cde54f7b authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

Merge "Enhancement for group operation in output switcher"

parents a633233b 2e7a02a0

packages/SystemUI/res/drawable/ic_check_box.xml

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

  Copyright (C) 2020 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:id="@+id/checked"

        android:state_checked="true"

        android:drawable="@drawable/ic_check_box_blue_24dp" />

    <item

        android:id="@+id/unchecked"

        android:state_checked="false"

        android:drawable="@drawable/ic_check_box_outline_24dp" />

</selector>

packages/SystemUI/res/drawable/ic_check_box_blue_24dp.xml

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

  Copyright (C) 2020 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"

        android:viewportHeight="24">

    <path

        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"

        android:fillColor="#4285F4"/>

</vector>

packages/SystemUI/res/drawable/ic_check_box_outline_24dp.xml

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

  Copyright (C) 2020 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"

        android:viewportHeight="24">

    <path

        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"

        android:fillColor="#757575"/>

</vector>

packages/SystemUI/res/drawable/ic_speaker_group_black_24dp.xml

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

  Copyright (C) 2020 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"

        android:viewportHeight="24">

    <path

        android:pathData="M18.2,1L9.8,1C8.81,1 8,1.81 8,2.8v14.4c0,0.99 0.81,1.79 1.8,1.79l8.4,0.01c0.99,0 1.8,-0.81 1.8,-1.8L20,2.8c0,-0.99 -0.81,-1.8 -1.8,-1.8zM14,3c1.1,0 2,0.89 2,2s-0.9,2 -2,2 -2,-0.89 -2,-2 0.9,-2 2,-2zM14,16.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"

        android:fillColor="#000000"/>

    <path

        android:pathData="M14,12.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"

        android:fillColor="#000000"/>

    <path

        android:pathData="M6,5H4v16c0,1.1 0.89,2 2,2h10v-2H6V5z"

        android:fillColor="#000000"/>

</vector>

packages/SystemUI/res/layout/media_output_list_item.xml

+102 −75
Original line number Diff line number Diff line
@@ -15,9 +15,13 @@ 
  ~ limitations under the License.

  -->



<FrameLayout

    android:id="@+id/device_container"

<LinearLayout

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

    android:id="@+id/device_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="64dp">
@@ -94,6 +98,7 @@ 
            android:visibility="gone"/>



        <View

            android:id="@+id/end_divider"

            android:layout_width="1dp"

            android:layout_height="36dp"

            android:layout_marginEnd="68dp"
@@ -102,10 +107,32 @@ 
            android:visibility="gone"/>



        <ImageView

        android:id="@+id/end_icon"

            android:id="@+id/add_icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_gravity="right|center_vertical"

            android:layout_marginEnd="24dp"

            android:src="@drawable/ic_add"

            android:tint="?android:attr/colorAccent"

            android:visibility="gone"/>



        <CheckBox

            android:id="@+id/check_box"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_gravity="right|center_vertical"

            android:layout_marginEnd="24dp"

            android:button="@drawable/ic_check_box"

            android:visibility="gone"/>

    </FrameLayout>



    <View

        android:id="@+id/bottom_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginTop="12dp"

        android:layout_marginBottom="12dp"

        android:layout_gravity="bottom"

        android:background="?android:attr/listDivider"

        android:visibility="gone"/>

</LinearLayout>
 
 No newline at end of file