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

Commit 66ea5a84 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7325276 from 3aaed127 to sc-v2-release

Change-Id: Ia6c2efd48f40363daec6e1afcc7b48eb5d3c53bf
parents 03eca513 3aaed127
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (C) 2019 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.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:color="?android:attr/colorControlHighlight">
    <item android:id="@android:id/mask">
        <shape android:shape="rectangle">
            <solid android:color="@android:color/white"/>
            <corners android:radius="@dimen/option_tile_radius" />
        </shape>
    </item>
    <item>
        <shape android:shape="rectangle">
            <solid android:color="?androidprv:attr/colorSurface"/>
            <corners android:radius="@dimen/option_tile_radius" />
        </shape>
    </item>
</ripple>
+2 −2
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@
        android:id="@+id/fragment_container"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginBottom="@dimen/bottom_navbar_height"/>
        android:layout_marginBottom="@dimen/bottom_actions_height"/>

    <com.google.android.material.bottomnavigation.BottomNavigationView
        android:id="@+id/main_bottom_nav"
        style="@style/BottomNavStyle"
        android:layout_width="match_parent"
        android:layout_height="@dimen/bottom_navbar_height"
        android:layout_height="@dimen/bottom_actions_height"
        android:layout_gravity="bottom"
        app:labelVisibilityMode="labeled"
        app:menu="@menu/bottom_navigation_menu"/>
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
        android:id="@+id/preview_fragment_container"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginBottom="@dimen/bottom_navbar_height" />
        android:layout_marginBottom="@dimen/bottom_actions_height" />

    <include layout="@layout/bottom_action_bar" />
</FrameLayout>
+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@
                android:id="@+id/options_container"
                android:layout_width="match_parent"
                android:layout_height="@dimen/options_container_height"
                android:layout_marginBottom="@dimen/options_container_bottom_margin"
                android:layout_marginHorizontal="@dimen/options_container_horizontal_margin"
                android:layout_marginBottom="@dimen/grid_options_container_bottom_margin"
                android:layout_marginHorizontal="@dimen/grid_options_container_horizontal_margin"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent" />
+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- no translation found for app_name (1647136562008520313) -->
    <skip />
    <string name="app_name" msgid="1647136562008520313">"વૉલપેપર અને શૈલી"</string>
    <string name="theme_title" msgid="2144932106319405101">"શૈલી"</string>
    <string name="clock_title" msgid="2126046720254613991">"ઘડિયાળ"</string>
    <string name="grid_title" msgid="1688173478777254123">"ઍપ ગ્રિડ"</string>
Loading