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

Commit dfb369d4 authored by Barnaby James's avatar Barnaby James Committed by Android (Google) Code Review
Browse files

Merge "Add activities to support voice settings."

parents 2132cedb c55ea15b

AndroidManifest.xml

+32 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ 
                android:value="true" />

        </activity>



        <activity android:name="AirplaneModeVoiceActivity"

                android:label="@string/wireless_networks_settings_title"

                android:theme="@android:style/Theme.Material.Light.Voice"

                android:exported="true">

            <intent-filter>

                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

        </activity>



        <!-- Top-level settings -->



        <activity android:name="Settings$WifiSettingsActivity"
@@ -996,6 +1007,16 @@ 
                android:value="com.android.settings.notification.NotificationStation" />

        </activity>



        <activity android:name=".notification.ZenModeVoiceActivity"

                android:theme="@android:style/Theme.Material.Light"

                android:label="@string/zen_mode_settings_title">

            <intent-filter>

                <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

        </activity>



        <!--

        <activity android:name="Settings$AppOpsSummaryActivity"

                android:label="@string/app_ops_settings"
@@ -1874,6 +1895,17 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".fuelguage.BatterySaverModeVoiceActivity"

                android:label="@string/power_usage_summary_title"

                android:theme="@android:style/Theme.Material.Light.Voice"

                android:exported="true">

            <intent-filter>

                <action android:name="android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

        </activity>



        <activity android:name="Settings$AccountSettingsActivity"

            android:label="@string/account_settings_title"

            android:taskAffinity=""

res/drawable/bg_circle_blue.xml

0 → 100644
+21 −0
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.

  -->



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

    android:shape="oval">

    <solid android:color="@color/blue" />

</shape>

res/layout/voice_interaction.xml

0 → 100644
+23 −0
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.

-->



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

    android:id="@+id/fragment_root"

    android:paddingLeft="8dp"

    android:paddingRight="8dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</FrameLayout>

res/layout/voice_item_row.xml

0 → 100644
+44 −0
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.

-->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >

    <LinearLayout

        android:id="@+id/row_one"

        android:orientation="horizontal"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_marginTop="20dp"

        android:layout_marginBottom="20dp">



        <TextView

            android:layout_width="0px"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:id="@+id/voice_item_label" />



        <TextView

            android:layout_width="100px"

            android:layout_height="100px"

            android:gravity="center_horizontal|center_vertical"

            android:background="@drawable/bg_circle_blue"

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

            android:textStyle="bold"

            android:id="@+id/voice_item_position" />

    </LinearLayout>

</LinearLayout>

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<resources>

    <color name="black">#000</color>

    <color name="red">#F00</color>

    <color name="blue">#00F</color>



    <color name="material_empty_color_light">#FFCED7DB</color>