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

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

Merge "Add description for Wi-Fi calling mode" 

am: 13e02af2

Change-Id: Iff0a3e6f814a8fbd7b3910589c5e712cd9dc9b26
parents e2f74af0 13e02af2

res/values/arrays.xml

+13 −0
Original line number Diff line number Diff line
@@ -1165,4 +1165,17 @@ 
        <item>0</item>

    </string-array>



    <!-- WiFi calling mode array -->

    <string-array name="wifi_calling_mode_summaries" translatable="false">

         <item>@string/wifi_calling_mode_wifi_preferred_summary</item>

         <item>@string/wifi_calling_mode_cellular_preferred_summary</item>

         <item>@string/wifi_calling_mode_wifi_only_summary</item>

    </string-array>



    <!-- WiFi calling mode array without wifi only mode -->

    <string-array name="wifi_calling_mode_summaries_without_wifi_only" translatable="false">

         <item>@string/wifi_calling_mode_wifi_preferred_summary</item>

         <item>@string/wifi_calling_mode_cellular_preferred_summary</item>

    </string-array>



</resources>

res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ 
        <attr name="aspectRatio" format="float" />

    </declare-styleable>



    <declare-styleable name="ListWithEntrySummaryPreference">

        <!-- Summaries of entry -->

        <attr name="entrySummaries" format="reference" />

    </declare-styleable>



    <!-- For UsageView -->

    <declare-styleable name="UsageView">

        <attr name="android:colorAccent" />

res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -291,6 +291,15 @@ 


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



    <!-- Visible vertical space we want to show below password edittext field when ime is shown.

         The unit is sp as it is related to the text size of password requirement item. -->

    <dimen name="visible_vertical_space_below_password">20sp</dimen>



    <!-- Select dialog -->

    <dimen name="select_dialog_padding_start">20dp</dimen>

    <dimen name="select_dialog_item_margin_start">12dp</dimen>

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



    <!-- Padding between the donut and the storage summary. -->

    <dimen name="storage_summary_padding_end">16dp</dimen>

    <!-- Text size of the big number in the donut. -->

res/values/strings.xml

+14 −6
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ 
    <!-- Title of WFC preference item [CHAR LIMIT=30] -->

    <string name="wifi_calling_mode_title">Calling preference</string>

    <!-- Title of WFC preference selection dialog [CHAR LIMIT=30] -->

    <string name="wifi_calling_mode_dialog_title">Wi-Fi calling mode</string>

    <string name="wifi_calling_mode_dialog_title">Calling preference</string>

    <!-- Title of WFC roaming preference item [CHAR LIMIT=45] -->

    <string name="wifi_calling_roaming_mode_title">Roaming preference</string>

    <!-- Summary of WFC roaming preference item [CHAR LIMIT=NONE]-->
@@ -2310,9 +2310,9 @@ 
    <!-- WFC mode dialog [CHAR LIMIT=45] -->

    <string name="wifi_calling_roaming_mode_dialog_title">Roaming preference</string>

    <string-array name="wifi_calling_mode_choices">

        <item>Wi-Fi preferred</item>

        <item>Mobile preferred</item>

        <item>Wi-Fi only</item>

        <item>@*android:string/wfc_mode_wifi_preferred_summary</item>

        <item>@*android:string/wfc_mode_cellular_preferred_summary</item>

        <item>@*android:string/wfc_mode_wifi_only_summary</item>

    </string-array>

    <string-array name="wifi_calling_mode_choices_v2">

        <item>Wi-Fi</item>
@@ -2325,8 +2325,8 @@ 
        <item>"0"</item>

    </string-array>

    <string-array name="wifi_calling_mode_choices_without_wifi_only">

        <item>Wi-Fi preferred</item>

        <item>Mobile preferred</item>

        <item>@*android:string/wfc_mode_wifi_preferred_summary</item>

        <item>@*android:string/wfc_mode_cellular_preferred_summary</item>

    </string-array>

    <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">

        <item>Wi-Fi</item>
@@ -2336,6 +2336,14 @@ 
        <item>"2"</item>

        <item>"1"</item>

    </string-array>













    <!-- Summary of WFC preference item on the WFC preference selection dialog. [CHAR LIMIT=70]-->













    <string name="wifi_calling_mode_wifi_preferred_summary">If Wi\u2011Fi is unavailable, use mobile network</string>













    <!-- Summary of WFC preference item on the WFC preference selection dialog. [CHAR LIMIT=70]-->













    <string name="wifi_calling_mode_cellular_preferred_summary">If mobile network is unavailable, use Wi\u2011Fi</string>













    <!-- Summary of WFC preference item on the WFC preference selection dialog. [CHAR LIMIT=70]-->













    <string name="wifi_calling_mode_wifi_only_summary">Call over Wi\u2011Fi. If Wi\u2011Fi is lost, call will end.</string>



























    <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->















    <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.<xliff:g id="additional_text" example="Learn More">%1$s</xliff:g></string>















    <!-- Wi-Fi Calling settings. Additional text displayed when Wi-Fi Calling is off. Default empty. [CHAR LIMIT=NONE] -->

































res/xml/single_choice_list_item_2.xml
0 → 100644



+58
−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:layout_width="match_parent"













    android:layout_height="wrap_content"













    android:paddingStart="@dimen/select_dialog_padding_start"













    android:paddingEnd="?android:attr/dialogPreferredPadding"













    android:orientation="horizontal"













    android:descendantFocusability="blocksDescendants">



























    <RadioButton













        android:id="@+id/radio"













        android:layout_width="wrap_content"













        android:layout_height="wrap_content"













        android:layout_gravity="center_vertical"













        android:clickable="false" />



























    <LinearLayout













        android:layout_width="0dp"













        android:layout_height="wrap_content"













        android:layout_weight="1"













        android:orientation="vertical"













        android:layout_marginStart="@dimen/select_dialog_item_margin_start"













        android:layout_gravity="center_vertical">



























        <TextView













            android:id="@+id/title"













            android:layout_width="wrap_content"













            android:layout_height="wrap_content"













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













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













            android:ellipsize="marquee" />



























        <TextView













            android:id="@+id/summary"













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:paddingBottom="@dimen/select_dialog_summary_padding_bottom"













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













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













            android:maxLines="10" />



























    </LinearLayout>













</LinearLayout>