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

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

Merge "Fix toast for wearables"

parents 377ca939 a94a2db4

core/res/res/drawable-watch/toast_frame.xml

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

<!--

/* 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.

*/

-->

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

       android:shape="rectangle">

    <!-- background is material_grey_700 with .9 alpha -->

    <solid android:color="#E65F6368" />

    <corners android:radius="24dp" />

</shape>

core/res/res/layout-watch/transient_notification.xml

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

<!--

/*

**

** 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.

*/

-->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingHorizontal="@dimen/screen_percentage_05"

    android:orientation="vertical">

    <TextView

        android:id="@android:id/message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:minHeight="48dp"

        android:paddingHorizontal="16dp"

        android:paddingVertical="8dp"

        android:gravity="center"

        android:textAppearance="@style/TextAppearance.Toast"

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

        />

</LinearLayout>
 
 No newline at end of file

core/res/res/values-w210dp-round-watch/styles.xml

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

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

-->



<resources>

    <style name="TextAppearance.Toast">

        <item name="fontFamily">roboto</item>

        <item name="textSize">15sp</item>

    </style>

</resources>
 
 No newline at end of file

core/res/res/values-watch/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -68,4 +68,7 @@ 
    <bool name="config_supportsMultiWindow">true</bool>

    <bool name="config_supportsMultiDisplay">true</bool>

    <bool name="config_supportsSplitScreenMultiWindow">false</bool>



     <!-- Default Gravity setting for the system Toast view. Equivalent to: Gravity.CENTER -->

     <integer name="config_toastDefaultGravity">0x00000011</integer>

</resources>

core/res/res/values-watch/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ 
    <dimen name="alert_dialog_title_height">0dp</dimen>

    <!-- Dialog button bar height, not used in watch due to dynamically sized button bar -->

    <dimen name="alert_dialog_button_bar_height">0dp</dimen>



    <dimen name="toast_y_offset">0dip</dimen>

</resources>