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

Commit f6e138cf authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Android (Google) Code Review
Browse files

Merge "NIU Actions: Support Dark Mode and Landscape" into sc-dev

parents 8bd4ef61 1e1f85be
Loading
Loading
Loading
Loading
+4 −14
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@
        android:layout_gravity="top|center_horizontal"
        android:orientation="horizontal">

        <Space
            android:layout_width="@dimen/go_overview_button_width"
            android:layout_height="1dp" />

        <Space
            android:layout_width="0dp"
            android:layout_height="1dp"
@@ -50,9 +46,8 @@
        </LinearLayout>

        <Space
            android:layout_width="0dp"
            android:layout_height="1dp"
            android:layout_weight="1" />
            android:layout_width="@dimen/go_overview_button_container_margin"
            android:layout_height="1dp" />

        <LinearLayout
            style="@style/GoOverviewActionButtonContainer">
@@ -68,9 +63,8 @@
        </LinearLayout>

        <Space
            android:layout_width="0dp"
            android:layout_height="1dp"
            android:layout_weight="1" />
            android:layout_width="@dimen/go_overview_button_container_margin"
            android:layout_height="1dp" />

        <LinearLayout
            style="@style/GoOverviewActionButtonContainer">
@@ -90,10 +84,6 @@
            android:layout_height="1dp"
            android:layout_weight="1" />

        <Space
            android:layout_width="@dimen/go_overview_button_width"
            android:layout_height="1dp" />

        <!-- Will be enabled in a future version. -->
        <LinearLayout
            style="@style/GoOverviewActionButtonContainer"
+39 −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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <com.android.quickstep.views.LauncherRecentsView
        android:id="@+id/overview_panel"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:accessibilityPaneTitle="@string/accessibility_recent_apps"
        android:clipChildren="false"
        android:clipToPadding="false"
        android:background="?attr/overviewBackgroundColor"
        android:visibility="invisible" />

    <com.android.quickstep.views.SplitPlaceholderView
        android:id="@+id/split_placeholder"
        android:layout_width="match_parent"
        android:layout_height="@dimen/split_placeholder_size"
        android:background="@android:color/darker_gray"
        android:visibility="gone" />

    <include
        android:id="@+id/overview_actions_view"
        layout="@layout/overview_actions_container" />

</merge>
+23 −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.
-->
<resources>
    <!-- Attributes used for Overview theming -->
    <attr name="overviewBackgroundColor" format="color" />
    <attr name="overviewButtonTextColor" format="color" />
    <attr name="overviewButtonIconColor" format="color" />
    <attr name="overviewButtonBackgroundColor" format="color" />
</resources>
 No newline at end of file
+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@
-->
<resources>
    <!-- Overview -->
    <color name="go_overview_button_icon_color">#3C4043</color>
    <color name="go_overview_background_color">#DADADA</color>
    <color name="go_overview_background_color_dark">#000000</color>
    <color name="go_overview_text_color">#3C4043</color>
    <color name="go_overview_text_color_dark">#F8F9FA</color>
    <color name="go_overview_button_color">#70FFFFFF</color>
    <color name="go_overview_button_color_dark">#303030</color>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@
    <dimen name="go_overview_button_width">60dp</dimen>
    <dimen name="go_overview_button_height">60dp</dimen>
    <dimen name="go_overview_button_container_width">80dp</dimen>
    <dimen name="go_overview_button_container_margin">16dp</dimen>
    <dimen name="go_overview_button_caption_margin">8dp</dimen>
    <dimen name="overview_actions_height">96dp</dimen>
    <dimen name="overview_proactive_row_height">0dp</dimen>
Loading