Merge 0958a787 on remote branch

<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (c) 2016, The Linux Foundation. All rights reserved.

Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

    android:minHeight="48dp"

    android:paddingEnd="?android:attr/scrollbarSize" >

    <RelativeLayout

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_marginStart="15dip"

        android:layout_marginEnd="6dip"

        android:layout_marginTop="6dip"

        android:layout_marginBottom="6dip"

        android:layout_weight="1">

        <TextView android:id="@+id/subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:text="@string/wifi_calling_settings_title"

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

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

        <TextView android:id="@+id/subsummary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@+id/subtitle"

            android:layout_alignStart="@+id/subtitle"

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

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

            android:maxLines="4" />

    </RelativeLayout>

    <Switch

        android:id="@+id/switchWidget"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:clickable="true"

        android:focusable="false"

        android:padding="8dip" />

</LinearLayout>

 No newline at end of file

    <item msgid="6062567900587138000">"SPN"</item>

    <item msgid="2454085083342423481">"IMSI"</item>

    <item msgid="2681427309183221543">"GID"</item>

    <item>"ICCID"</item>

  </string-array>

  <string-array name="app_install_location_entries">

    <item msgid="8151497958991952759">"内部存储设备"</item>

    <string name="profiles_settings_title">情景模式</string>

    <string name="mbn_version">MBN 版本</string>

    <string name="show_battery_percentage">显示电池电量百分比</string>

    <string name="show_battery_percentage_summary">在状态栏中显示电池电量百分比</string>

</resources>

    <item msgid="6062567900587138000">"SPN"</item>

    <item msgid="2454085083342423481">"IMSI"</item>

    <item msgid="2681427309183221543">"GID"</item>

    <item>"ICCID"</item>

  </string-array>

  <string-array name="app_install_location_entries">

    <item msgid="8151497958991952759">"內部裝置儲存空間"</item>

    <item msgid="6062567900587138000">"SPN"</item>

    <item msgid="2454085083342423481">"IMSI"</item>

    <item msgid="2681427309183221543">"GID"</item>

    <item>"ICCID"</item>

  </string-array>

  <string-array name="app_install_location_entries">

    <item msgid="8151497958991952759">"內部裝置儲存空間"</item>