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

Commit 3af2123e authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.

parents f3e3f26f 1c365312

res/layout-land/dialpad_fragment.xml

+11 −0
Original line number Diff line number Diff line
@@ -81,6 +81,17 @@ 


            </FrameLayout>



            <TextView

                android:id="@+id/dialpad_floating_operator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_above="@id/dialpad_floating_action_button_margin_bottom"

                android:layout_toRightOf="@+id/dialpad_floating_action_button_container"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="12sp"

                android:singleLine="true"

                android:visibility="gone" />



        </RelativeLayout>



    </LinearLayout>

res/layout/add_speed_dial_dialog.xml

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

<!--

 * Copyright (c) 2015, 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="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1.0"

        android:gravity="center_vertical"

        android:baselineAligned="false"

        android:paddingStart="10dip"

        android:paddingEnd="10dip">



        <EditText

            android:id="@+id/edit_container"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:orientation="vertical"

            android:hint="@string/input_number"

            android:inputType="phone"

            android:singleLine="true" />



        <ImageButton

            android:id="@+id/select_contact"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:padding="10dip"

            android:src="@drawable/ic_contacts_holo_dark" />

    </LinearLayout>



    <View

        android:background="?android:dividerHorizontal"

        android:layout_width="fill_parent"

        android:layout_height="1dip" />



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content" >



        <Button

            android:id="@+id/btn_cancel"

            android:focusable="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:text="@string/speed_dial_cancel"

            style="?android:attr/buttonBarButtonStyle" />



        <View

            android:background="?android:dividerHorizontal"

            android:layout_width="1dip"

            android:layout_height="fill_parent" />



        <Button

            android:id="@+id/btn_complete"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:text="@string/speed_dial_ok"

            style="?android:attr/buttonBarButtonStyle" />

    </LinearLayout>

</LinearLayout>

res/layout/call_log_list_item.xml

+11 −0
Original line number Diff line number Diff line
@@ -121,7 +121,18 @@ 
                        android:layout_gravity="center_vertical"

                        android:tint="?attr/call_log_secondary_text_color"

                        android:scaleType="centerInside"

                        android:visibility="gone"

                        />

                    <TextView

                        android:id="@+id/operator"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_marginRight="@dimen/call_log_icon_margin"

                        android:layout_gravity="center_vertical"

                        android:textColor="?attr/call_log_secondary_text_color"

                        android:textSize="12sp"

                        android:singleLine="true"

                        android:visibility="gone" />

                    <TextView

                        android:id="@+id/call_location_and_date"

                        android:layout_width="wrap_content"

res/layout/dialpad_fragment.xml

+10 −0
Original line number Diff line number Diff line
@@ -73,4 +73,14 @@ 


    </FrameLayout>



    <TextView

        android:id="@+id/dialpad_floating_operator"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/dialpad_floating_action_button_container"

        android:layout_centerHorizontal="true"

        android:textColor="?attr/call_log_secondary_text_color"

        android:textSize="12sp"

        android:singleLine="true"

        android:visibility="gone" />

</view>

res/values-zh-rCN/cm_strings.xml

+17 −0
Original line number Diff line number Diff line
@@ -73,4 +73,21 @@ 
    <string name="speed_dial_settings">快速拨号设置</string>

    <string name="lookup_settings_description">未知号码查询</string>

    <string name="call_stats_reset_filter">重置时间范围</string>

    <plurals name="hour">

        <item quantity="one">1 小时</item>

        <item quantity="other">%d 小时</item>

    </plurals>

    <plurals name="minute">

        <item quantity="one">1 分钟</item>

        <item quantity="other">%d 分钟</item>

    </plurals>

    <plurals name="second">

        <item quantity="one">1 秒</item>

        <item quantity="other">%d 秒</item>

    </plurals>



    <plurals name="call">

        <item quantity="one">1 个电话</item>

        <item quantity="other">%d 个电话</item>

    </plurals>

</resources>