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

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

Merge "Implement SmartReplyView"

parents 4e588baa ed7429c5

packages/SystemUI/res/drawable/smart_reply_button_background.xml

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



<!--

  ~ Copyright (C) 2017 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"

        android:color="@color/notification_ripple_untinted_color">

    <item>

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/smart_reply_button_corner_radius"/>

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

        </shape>

    </item>

</ripple>

packages/SystemUI/res/layout/smart_reply_button.xml

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



<!--

  ~ Copyright (C) 2017 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

  -->



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

        style="@android:style/Widget.Material.Button.Borderless.Small"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/smart_reply_button_spacing"

        android:paddingVertical="@dimen/smart_reply_button_padding_vertical"

        android:paddingHorizontal="@dimen/smart_reply_button_corner_radius"

        android:background="@drawable/smart_reply_button_background"

        android:gravity="center"

        android:fontFamily="sans-serif"

        android:textSize="@dimen/smart_reply_button_font_size"

        android:textColor="@color/smart_reply_button_text"

        android:textStyle="normal"

        android:singleLine="true"/>
 
 No newline at end of file

packages/SystemUI/res/layout/smart_reply_view.xml

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



<!--

  ~ Copyright (C) 2017 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 -->

<com.android.systemui.statusbar.policy.SmartReplyView

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

    android:id="@+id/smart_reply_view"

    android:layout_height="wrap_content"

    android:layout_width="wrap_content"

    android:layout_gravity="end">

    <!-- smart_reply_button(s) will be added here. -->

</com.android.systemui.statusbar.policy.SmartReplyView>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -156,4 +156,6 @@ 


    <color name="zen_introduction">#ffffffff</color>



    <color name="smart_reply_button_text">#ff4285f4</color><!-- blue 500 -->

    <color name="smart_reply_button_background">#fff7f7f7</color>

</resources>

packages/SystemUI/res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -882,4 +882,9 @@ 
    <!-- Home button padding for sizing -->

    <dimen name="home_padding">15dp</dimen>



    <!-- Smart reply button -->

    <dimen name="smart_reply_button_corner_radius">24dip</dimen>

    <dimen name="smart_reply_button_spacing">8dp</dimen>

    <dimen name="smart_reply_button_padding_vertical">4dp</dimen>

    <dimen name="smart_reply_button_font_size">14sp</dimen>

</resources>