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

Commit 0df7e324 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4778776 from 8a9c47e1 to pi-release 

Change-Id: Ic072ded34641bf8529e875612917805b126eb132
parents 673ba5d0 8a9c47e1

AndroidManifest.xml

+24 −2
Original line number Diff line number Diff line
@@ -742,6 +742,27 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name=".notification.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_zen"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.ZEN" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

            <meta-data android:name="com.android.settings.dismiss"

                       android:value="0" />

            <meta-data android:name="com.android.settings.title"

                       android:resource="@string/zen_suggestion_title" />

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/zen_suggestion_summary" />

        </activity>



        <activity

            android:name=".notification.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
@@ -755,7 +776,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity

            android:name="Settings$ZenModeAutomationSettingsActivity"

            android:label="@string/zen_mode_automation_settings_title"
@@ -1114,7 +1134,9 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".slice.SliceDeepLinkSpringBoard"

        <activity

            android:name=".slices.SliceDeepLinkSpringBoard"

            android:excludeFromRecents="true"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

res/drawable/ic_local_phone_24_lib.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

    Copyright 2018 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="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorControlNormal">



    <path

        android:fillColor="#000000"

        android:pathData="M16.01,14.48l-2.62,2.62c-2.75-1.49-5.01-3.75-6.5-6.5l2.62-2.62c0.24-0.24,0.34-0.58,0.27-0.9L9.13,3.82 c-0.09-0.47-0.5-0.8-0.98-0.8L4,3.01c-0.56,0-1.03,0.47-1,1.03c0.17,2.91,1.04,5.63,2.43,8.01c1.57,2.69,3.81,4.93,6.5,6.5 c2.38,1.39,5.1,2.26,8.01,2.43c0.56,0.03,1.03-0.44,1.03-1l0-4.15c0-0.48-0.34-0.89-0.8-0.98l-3.26-0.65 C16.58,14.14,16.24,14.24,16.01,14.48z" />

    <path

        android:pathData="M0,0h24v24H0V0z" />

</vector>

res/drawable/ic_zen.xml

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:width="24dp" >



    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="?android:attr/colorControlActivated"

        android:pathData="M 12 2 C 6.48 2 2 6.48 2 12 s 4.48 10 10 10 10 -4.48 10 -10 S 17.52 2 12 2 z m 4 11 H 8 c -.55 0 -1 -.45 -1 -1 s .45 -1 1 -1 h 8c.55 0 1 .45 1 1 s -.45 1 -1 1z" />



</vector>

res/layout/gesture_preference.xml

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

<!-- Copyright (C) 2016 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.

-->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

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

    android:clipToPadding="false"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="24dp"

        android:paddingBottom="16dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:background="@android:color/white">



        <TextView

            android:id="@android:id/title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:singleLine="true"

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

            android:ellipsize="marquee"/>



        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="end|center_vertical"/>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/gesture_animation_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/gestures_setting_background_color"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:orientation="horizontal">



        <com.android.settings.widget.AspectRatioFrameLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:padding="@dimen/gesture_animation_padding">



            <TextureView

                android:id="@+id/gesture_video"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"/>



            <ImageView

                android:id="@+id/gesture_image"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="fitXY"

                android:background="@color/gestures_setting_background_color"/>



            <ImageView

                android:id="@+id/gesture_play_button"

                android:layout_width="@dimen/gestures_play_button_size"

                android:layout_height="@dimen/gestures_play_button_size"

                android:src="@drawable/ic_gesture_play_button"

                android:gravity="center"

                android:layout_gravity="center"/>



        </com.android.settings.widget.AspectRatioFrameLayout>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="@dimen/gestures_settings_padding_top_bottom"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

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

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

            android:maxLines="10"

            android:ellipsize="end"/>



    </LinearLayout>



</LinearLayout>

res/layout/preference_volume_slider.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip">

        android:layout_marginTop="16dip"

        android:layout_marginBottom="16dip">



        <LinearLayout

            android:layout_width="match_parent"