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

Commit 562f6322 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev

parents c491501a a9fa0059

res/drawable/ic_call_24dp.xml

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

-->



<vector

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27

         0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55

          -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1

          0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_chat_24dp.xml

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

-->



<vector

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M20,2H4c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1

         -0.9,-2 -2,-2zM6,9h12v2H6V9zm8,5H6v-2h8v2zm4,-6H6V6h12v2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_mail_24dp.xml

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

-->



<vector

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9

        2,-2V6c0,-1.1 -0.9,-2 -2,-2zm0,4l-8,5 -8,-5V6l8,5 8,-5v2z"/>

</vector>
 
 No newline at end of file

res/layout/support_escalation_card.xml

+14 −13
Original line number Diff line number Diff line
@@ -17,29 +17,30 @@ 


<android.support.v7.widget.CardView

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

    android:layout_width="0dp"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:layout_marginBottom="16dp"

    android:layout_marginBottom="4dp"

    android:layout_marginEnd="8dp"

    android:layout_marginStart="8dp"

    android:layout_marginTop="16dp"

    android:background="?android:attr/selectableItemBackground">

    android:layout_marginTop="4dp"

    android:clickable="true"

    android:foreground="?android:attr/selectableItemBackground">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="16dp"

        android:orientation="vertical">

        android:orientation="horizontal">

        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"

            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"

            android:scaleType="centerInside"/>

        <TextView

            android:id="@+id/title"

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.TileTitle"/>

        <TextView

            android:id="@+id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

    </LinearLayout>

</android.support.v7.widget.CardView>
 
 No newline at end of file

res/layout/support_fragment.xml

+3 −48
Original line number Diff line number Diff line
@@ -15,53 +15,8 @@ 
     limitations under the License.

-->



<ScrollView

<android.support.v7.widget.RecyclerView

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

    android:id="@+id/support_items"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">

        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingEnd="16dp"

            android:paddingStart="16dp"

            android:paddingTop="16dp"

            android:text="@string/support_escalation_title"

            android:textColor="@color/material_grey_900"

            android:textSize="16sp"/>

        <LinearLayout

            android:id="@+id/escalation_options"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingEnd="8dp"

            android:paddingStart="8dp">

            <include

                android:id="@+id/escalation_by_phone"

                layout="@layout/support_escalation_card"/>

            <include

                android:id="@+id/escalation_by_email"

                layout="@layout/support_escalation_card"/>

        </LinearLayout>

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="?android:attr/listDivider"/>

        <include

            android:id="@+id/forum_tile"

            layout="@layout/support_tile"/>

        <include

            android:id="@+id/article_tile"

            layout="@layout/support_tile"/>

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="?android:attr/listDivider"/>

        <include

            android:id="@+id/feedback_tile"

            layout="@layout/support_tile"/>

    </LinearLayout>

</ScrollView>
 
 No newline at end of file
 
    android:layout_height="match_parent"/>
 
 No newline at end of file