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

Commit 83f74d91 authored by yumeng's avatar yumeng Committed by Gerrit - the friendly Code Review server
Browse files

Settings: Modify MODE RJIL to change the font dialog. 

Custom modifications fonts Dialog in RJIL mode,
and the user selects "verylarge" when the warning message.

Change-Id: Idff9be55969b4aedd2542f1ce04522fff1c3d667
CRs-Fixed: 1029386
parent 07921b72

res/layout/dialog_fontwaring.xml

0 → 100644
+82 −0
Original line number Original line Diff line number Diff line 
<?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:orientation="vertical">



    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="@dimen/dialog_font_warining_title_margin"

        android:text="@string/dialog_font_warining_title"

        android:textSize="20dip"

        android:textStyle="bold" />



    <View

        android:layout_width="match_parent"

        android:layout_height="2dp"

        android:background="#ddd" />



    <TextView

        android:id="@+id/waring_information"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="@dimen/dialog_font_warining_content_margin"

        android:text="@string/dialog_font_warining_content"

        android:textSize="16dip" />



    <CheckBox

        android:id="@+id/showagain"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/dialog_font_warining_checkbox_margin_bottom"

        android:layout_marginLeft="@dimen/dialog_font_warining_checkbox_margin_left"

        android:checked="false"

        android:text="@string/dialog_font_warining_ck_information"

        android:textSize="16dip" />



    <View

        android:layout_width="match_parent"

        android:layout_height="@dimen/dialog_font_warining_view_height"

        android:background="#ddd" />



    <TextView

        android:id="@+id/ok_message"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="@dimen/dialog_font_warining_checkbox_margin_bottom"

        android:gravity="center"

        android:text="@string/dialog_font_warining_ok"

        android:textSize="18dip"

        android:textStyle="bold" />



</LinearLayout>
 
 No newline at end of file

res/layout/font_dialog.xml

0 → 100644
+104 −0
Original line number Original line Diff line number Diff line 
<?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="match_parent"

    android:orientation="vertical">



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/dialog_font_choose_title_margin_bottom"

        android:layout_marginLeft="@dimen/dialog_font_choose_title_margin_left"

        android:layout_marginTop="@dimen/dialog_font_choose_title_margin_top"

        android:text="@string/title_font_size"

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

        android:textSize="@dimen/dialog_font_choose_title_textsize"

        android:textStyle="bold" />





    <RadioGroup

        android:id="@+id/font_choose"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/dialog_font_choose_radiogroup_margin_left"

        android:orientation="vertical">



        <RadioButton

            android:id="@+id/rb_minimum"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/dialog_font_choose_radiobutton_margin"

            android:paddingLeft="@dimen/dialog_font_choose_radiobutton_padding_left"

            android:text="@string/choose_font_Minimum"

            android:textSize="14dip" />



        <RadioButton

            android:id="@+id/rb_small"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/dialog_font_choose_radiobutton_margin"

            android:paddingLeft="@dimen/dialog_font_choose_radiobutton_padding_left"

            android:text="@string/choose_font_Small"

            android:textSize="15dip" />





        <RadioButton

            android:id="@+id/rb_medium"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/dialog_font_choose_radiobutton_margin"

            android:checked="true"

            android:paddingLeft="@dimen/dialog_font_choose_radiobutton_padding_left"

            android:text="@string/choose_font_Medium"

            android:textSize="16dip" />





        <RadioButton

            android:id="@+id/rb_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/dialog_font_choose_radiobutton_margin"

            android:paddingLeft="@dimen/dialog_font_choose_radiobutton_padding_left"

            android:text="@string/choose_font_Large"

            android:textSize="17dip" />



        <RadioButton

            android:id="@+id/rb_verylarge"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/dialog_font_choose_radiobutton_margin"

            android:paddingLeft="@dimen/dialog_font_choose_radiobutton_padding_left"

            android:text="@string/choose_font_VeryLarge"

            android:textSize="19dip" />



    </RadioGroup>



</LinearLayout>
 
 No newline at end of file

res/values/arrays.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -155,6 +155,14 @@ 
        <item>1.30</item>

        <item>1.30</item>

    </string-array>

    </string-array>





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

        <item>0.95</item>

        <item>1.0</item>

        <item>1.05</item>

        <item>1.15</item>

        <item>1.30</item>

    </string-array>



    <!-- Wi-Fi settings -->

    <!-- Wi-Fi settings -->





    <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />

    <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />

res/values/bools.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,9 @@ 
    <bool name="config_hide_mms_enable">false</bool>

    <bool name="config_hide_mms_enable">false</bool>

    <!-- show pop up notification for turn off wifi begin -->

    <!-- show pop up notification for turn off wifi begin -->

    <bool name="hotspot_show_turn_off_wifi_dialog">false</bool>

    <bool name="hotspot_show_turn_off_wifi_dialog">false</bool>



    <!-- Whether to enable the default ipv4/v6 for creating new APN -->

    <!-- Whether to enable the default ipv4/v6 for creating new APN -->

    <bool name="config_default_apn_for_new">false</bool>

    <bool name="config_default_apn_for_new">false</bool>

    <!-- whether to show font size dialog config -->

    <bool name="show_font_size_config">false</bool>

</resources>
 
</resources>

res/values/dimens.xml

+16 −0
Original line number Original line Diff line number Diff line
@@ -304,4 +304,20 @@ 
    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->

    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->

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

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





    <!--Font choose dialog -->

    <dimen name="dialog_font_choose_title_margin_left">20dip</dimen>

    <dimen name="dialog_font_choose_title_margin_top">14dip</dimen>

    <dimen name="dialog_font_choose_title_margin_bottom">4dip</dimen>

    <dimen name="dialog_font_choose_title_textsize">20dip</dimen>

    <dimen name="dialog_font_choose_radiogroup_margin_left">25dip</dimen>

    <dimen name="dialog_font_choose_radiobutton_padding_left">20dip</dimen>

    <dimen name="dialog_font_choose_radiobutton_margin">5dip</dimen>



    <!--Font choose verylarge dialog  warining-->

    <dimen name="dialog_font_warining_title_margin">15dp</dimen>

    <dimen name="dialog_font_warining_content_margin">15dp</dimen>

    <dimen name="dialog_font_warining_checkbox_margin_left">35dp</dimen>

    <dimen name="dialog_font_warining_checkbox_margin_bottom">10dp</dimen>

    <dimen name="dialog_font_warining_view_height">2dp</dimen>



</resources>
 
</resources>