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

Commit c99b30b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating widget tray theme" into ub-launcher3-master

parents c6cf493b d5d5e227

res/drawable/quantum_panel_dark.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

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

       android:drawable="@drawable/quantum_panel_shape_dark"

       android:insetBottom="@dimen/quantum_panel_outer_padding"

       android:insetLeft="@dimen/quantum_panel_outer_padding"

       android:insetRight="@dimen/quantum_panel_outer_padding"

       android:insetTop="@dimen/quantum_panel_outer_padding" />

res/drawable/quantum_panel_shape_dark.xml→res/drawable/round_rect_primary.xml

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
-->

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

       android:shape="rectangle">

    <solid android:color="?attr/colorSecondary" />

    <corners

        android:radius="2dp" />

    <solid android:color="?android:attr/colorPrimary" />

    <corners android:radius="2dp" />

</shape>

res/layout/add_item_confirmation_activity.xml

+5 −5
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
    android:layout_height="match_parent">



    <TextView

        android:paddingLeft="16dp"

        android:paddingRight="16dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:paddingLeft="24dp"

        android:paddingRight="24dp"

        android:paddingTop="4dp"

        android:paddingBottom="20dp"

        android:text="@string/add_item_request_drag_hint"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />
@@ -33,7 +33,7 @@ 
    <FrameLayout

        android:theme="@style/WidgetContainerTheme"

        android:layout_width="match_parent"

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

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

        android:layout_height="wrap_content">



        <include

res/layout/all_apps.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
            android:focusable="true"

            android:paddingStart="@dimen/container_fastscroll_thumb_max_width"

            android:paddingEnd="@dimen/container_fastscroll_thumb_max_width"

            android:theme="@style/CustomOverscroll.Light" />

            android:theme="@style/AllAppsOverscroll" />



        <!-- Fast scroller popup -->

        <TextView

res/layout/appwidget_error.xml

+3 −2
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
    android:layout_height="match_parent"

    android:gravity="center"

    android:elevation="2dp"

    android:padding="4dp"

    android:theme="@style/WidgetContainerTheme"

    android:background="@drawable/quantum_panel_dark"

    android:background="@drawable/round_rect_primary"

    android:textAppearance="?android:attr/textAppearanceMediumInverse"

    android:textColor="@color/widgets_view_item_text_color"

    android:textColor="?android:attr/textColorSecondary"

    android:text="@string/gadget_error_text"

    />