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

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

Merge "UI Tweaks to Zen Mode Voice Activity."

parents 8be177bf f79e2d11

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ 


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

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

                android:label="@string/zen_mode_settings_title">

                android:label="@string/zen_mode_interruptions_voice_title">

            <intent-filter>

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

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

res/drawable/bg_circle_blue.xml→res/drawable/bg_voice_position.xml

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



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

    android:shape="oval">

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

    android:shape="rectangle">

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

</shape>

res/layout/voice_interaction.xml

+15 −5
Original line number Diff line number Diff line
@@ -14,10 +14,20 @@ 
     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"

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

    android:padding="8dp"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</FrameLayout>
 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

        android:textColor="@color/voice_interaction_highlight"

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

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

        android:id="@+id/voice_fragment_root"

        android:padding="8dp"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

</LinearLayout>

res/layout/voice_item_row.xml

+5 −5
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_marginTop="20dp"

        android:layout_marginBottom="20dp">

        android:layout_marginTop="15dp"

        android:layout_marginBottom="15dp">



        <TextView

            android:layout_width="0px"
@@ -33,10 +33,10 @@ 
            android:id="@+id/voice_item_label" />



        <TextView

            android:layout_width="100px"

            android:layout_height="100px"

            android:layout_width="80px"

            android:layout_height="80px"

            android:gravity="center_horizontal|center_vertical"

            android:background="@drawable/bg_circle_blue"

            android:background="@drawable/bg_voice_position"

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

            android:textStyle="bold"

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

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -83,4 +83,5 @@ 
    <color name="confirm_device_credential_dark_background">#263238</color>

    <color name="fab_ripple">#1fffffff</color><!-- 12% white -->

    <color name="fab_shape">#ff009688</color><!-- Teal 500 -->

    <color name="voice_interaction_highlight">#33b5e5</color>

</resources>