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

Commit fc509a2c authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

Merge "Update divider bar layout to match stage split design" into sc-v2-dev...

Merge "Update divider bar layout to match stage split design" into sc-v2-dev am: 61babbcf am: 59d30e06

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

Change-Id: I91dd3d0f7780120637d4fa6d2dcee2137d1c4eb2
parents fc62e9b2 59d30e06
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ 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.
  -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:color="@android:color/system_neutral2_500" android:lStar="35" />
</selector>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    <View
        style="@style/DockedDividerBackground"
        android:id="@+id/docked_divider_background"
        android:background="@color/docked_divider_background"/>
        android:background="@color/split_divider_background"/>

    <com.android.wm.shell.legacysplitscreen.MinimizedDockShadow
        style="@style/DockedDividerMinimizedShadow"
+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@

    <View
        style="@style/DockedDividerBackground"
        android:id="@+id/docked_divider_background"
        android:background="@color/docked_divider_background"/>
        android:id="@+id/docked_divider_background"/>

    <com.android.wm.shell.common.split.DividerHandleView
        style="@style/DockedDividerHandle"
+4 −0
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@
*/
-->
<resources>
    <!-- Divider handle size for legacy split screen -->
    <dimen name="docked_divider_handle_width">2dp</dimen>
    <dimen name="docked_divider_handle_height">16dp</dimen>
    <!-- Divider handle size for split screen -->
    <dimen name="split_divider_handle_width">3dp</dimen>
    <dimen name="split_divider_handle_height">72dp</dimen>

    <!-- Padding between status bar and bubbles when displayed in expanded state, smaller
     value in landscape since we have limited vertical space-->
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@
        <item name="android:layout_width">10dp</item>
        <item name="android:layout_height">match_parent</item>
        <item name="android:layout_gravity">center_horizontal</item>
        <item name="android:background">@color/split_divider_background</item>
    </style>

    <style name="DockedDividerHandle">
Loading