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

Commit 257e6f71 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Base implementation of WFC disclaimer UI" 

am: 7e2c23aa

Change-Id: Ib89de5bf801b6669795e7c49010136a0e966324a
parents f784db5c 7e2c23aa

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -3341,6 +3341,17 @@ 
        <service android:name=".fuelgauge.batterytip.AnomalyDetectionJobService"

                 android:permission="android.permission.BIND_JOB_SERVICE" />



        <activity

            android:name="Settings$WifiCallingDisclaimerActivity"

            android:label="@string/wifi_calling_settings_title"

            android:taskAffinity="com.android.settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.wifi.calling.WifiCallingDisclaimerFragment" />

        </activity>

        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

res/layout/wfc_disclaimer_fragment.xml

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

-->

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:layout_marginStart="16dp"

        android:layout_marginBottom="20dp"

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

        android:text="@string/wfc_disclaimer_title_text" />



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

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



    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/disclaimer_item_list"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



        <Button

            android:id="@+id/disagree_button"

            style="@style/DisclaimerNegativeButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:text="@string/wfc_disclaimer_disagree_text" />



        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1" />



        <Button

            android:id="@+id/agree_button"

            style="@style/DisclaimerPositiveButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:text="@string/wfc_disclaimer_agree_button_text" />

    </LinearLayout>

</LinearLayout>

res/layout/wfc_simple_disclaimer_item.xml

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

-->

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"

    android:paddingBottom="20dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:gravity="center_vertical">

    <TextView

        android:id="@+id/disclaimer_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

    <TextView

        android:id="@+id/disclaimer_desc"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@android:style/TextAppearance.Material.Body1"

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

        android:layout_below="@id/disclaimer_title" />

</RelativeLayout>
 
 No newline at end of file

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -10088,4 +10088,13 @@ 














    <!-- Title for Connected device shortcut [CHAR LIMIT=30] -->















    <string name="devices_title">Devices</string>

























    <!-- Label for the title on wfc disclaimer fragment. [CHAR LIMIT=40] -->













    <string name="wfc_disclaimer_title_text">Important information</string>

























    <!-- Label for the agree button on wfc disclaimer fragment. [CHAR LIMIT=30] -->













    <string name="wfc_disclaimer_agree_button_text">CONTINUE</string>

























    <!-- Label for the disagree button on wfc disclaimer fragment. [CHAR LIMIT=30] -->













    <string name="wfc_disclaimer_disagree_text">NO THANKS</string>















</resources>

























res/values/styles.xml



+12
−0




























Original line number
Diff line number
Diff line








@@ -506,4 +506,16 @@













        <item name="android:paddingBottom">24dp</item>















    </style>





























    <style name="DisclaimerPositiveButton" parent="@style/SuwGlifButton.Primary">













        <item name="android:layout_margin">16dp</item>













        <item name="android:paddingStart">8dp</item>













        <item name="android:paddingEnd">8dp</item>













    </style>



























    <style name="DisclaimerNegativeButton" parent="@style/SuwGlifButton.Secondary">













        <item name="android:layout_margin">16dp</item>













        <item name="android:paddingStart">8dp</item>













        <item name="android:paddingEnd">8dp</item>













    </style>





























</resources>