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

Commit bd815445 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Align rounded corners beside divider bar with display and task bar"... 

Merge "Align rounded corners beside divider bar with display and task bar" into sc-v2-dev am: d13ce08d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854467

Change-Id: I3a1814b447fd3883c438dcaf0d27cb70383b75c1
parents b92f1b55 d13ce08d

libs/WindowManager/Shell/res/drawable/split_rounded_bottom.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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="@dimen/split_divider_corner_size"

        android:height="@dimen/split_divider_corner_size"

        android:viewportWidth="42"

        android:viewportHeight="42">



    <group android:pivotX="21"

           android:pivotY="21"

           android:rotation="180">

        <path

            android:fillColor="@color/split_divider_background"

            android:pathData="m 0 0 c 8 0 16 8 16 16 h 10 c 0 -8 8 -16 16 -16 z" />

    </group>



</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/split_rounded_left.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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="@dimen/split_divider_corner_size"

        android:height="@dimen/split_divider_corner_size"

        android:viewportWidth="42"

        android:viewportHeight="42">



    <group android:pivotX="21"

           android:pivotY="21"

           android:rotation="-90">

        <path

            android:fillColor="@color/split_divider_background"

            android:pathData="m 0 0 c 8 0 16 8 16 16 h 10 c 0 -8 8 -16 16 -16 z" />

    </group>



</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/split_rounded_right.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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="@dimen/split_divider_corner_size"

        android:height="@dimen/split_divider_corner_size"

        android:viewportWidth="42"

        android:viewportHeight="42">



    <group android:pivotX="21"

           android:pivotY="21"

           android:rotation="90">

        <path

            android:fillColor="@color/split_divider_background"

            android:pathData="m 0 0 c 8 0 16 8 16 16 h 10 c 0 -8 8 -16 16 -16 z" />

    </group>



</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/split_rounded_top.xml

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

  ~ Copyright (C) 2021 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="@dimen/split_divider_corner_size"

        android:height="@dimen/split_divider_corner_size"

        android:viewportWidth="42"

        android:viewportHeight="42">



    <path

        android:fillColor="@color/split_divider_background"

        android:pathData="m 0 0 c 8 0 16 8 16 16 h 10 c 0 -8 8 -16 16 -16 z" />



</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/layout/split_divider.xml

+4 −4
Original line number Diff line number Diff line
@@ -24,20 +24,20 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <View style="@style/DockedDividerTopLeftRoundCorner"/>



        <View

            style="@style/DockedDividerBackground"

            android:id="@+id/docked_divider_background"/>



        <View style="@style/DockedDividerBottomRightRoundCorner"/>



        <com.android.wm.shell.common.split.DividerHandleView

            style="@style/DockedDividerHandle"

            android:id="@+id/docked_divider_handle"

            android:contentDescription="@string/accessibility_divider"

            android:background="@null"/>



        <com.android.wm.shell.common.split.DividerRoundedCorner

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>



    </FrameLayout>



</com.android.wm.shell.common.split.DividerView>