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

Commit 4046cf9c authored by PauloftheWest's avatar PauloftheWest Committed by Android (Google) Code Review
Browse files

Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

parents 35314f27 50e6ecac

res/layout/multi_sim_dialog.xml

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/sim_dialog_margin_top"

                    android:paddingStart="@dimen/sim_label_padding"

                    android:text="@string/sim_editor_name"

                    style="?android:attr/textAppearanceMedium" />
@@ -40,6 +41,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:singleLine="true"

                    android:layout_marginStart="@dimen/sim_content_padding"

                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"

                    android:hint="@string/wifi_ssid_hint"

                    android:inputType="textNoSuggestions"
@@ -56,12 +58,14 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/sim_dialog_margin_top"

                    android:paddingStart="@dimen/sim_label_padding"

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



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

                    android:textColor="@android:color/black"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingStart="@dimen/sim_label_padding"

                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"

                    android:singleLine="true"

                    style="?android:attr/textAppearanceMedium" />
@@ -77,12 +81,14 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/sim_dialog_margin_top"

                    android:paddingStart="@dimen/sim_label_padding"

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



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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"

                    android:paddingStart="@dimen/sim_label_padding"

                    android:singleLine="true"

                    android:textColor="@android:color/black"

                    style="?android:attr/textAppearanceMedium" />
@@ -97,6 +103,7 @@ 
            <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingStart="@dimen/sim_label_padding"

                    android:layout_marginTop="@dimen/sim_dialog_margin_top"

                    android:text="@string/sim_editor_num_format" />
@@ -105,6 +112,7 @@ 
                    android:layout_height="wrap_content"

                    android:entries="@array/sim_card_data_range"

                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"

                    android:paddingStart="@dimen/sim_content_padding"

                    android:prompt="@string/sim_editor_num_format" />



        </LinearLayout>

res/values/arrays.xml

+18 −0
Original line number Diff line number Diff line
@@ -1265,4 +1265,22 @@ 
        <item>Cached (activity client)</item>

        <item>Cached (empty)</item>

    </string-array>



    <!-- Multi-SIM titles for captioning color preference. -->

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

        <item>@string/color_blue</item>

        <item>@string/color_green</item>

        <item>@string/color_purple</item>

        <item>@string/color_red</item>

        <item>@string/color_orange</item>

    </string-array>



    <!-- Multi-SIM colors. -->

    <integer-array name="sim_info_picker_color_values" translatable="false" >

        <item>@color/blue_500</item>

        <item>@color/green_500</item>

        <item>@color/purple_500</item>

        <item>@color/red_500</item>

        <item>@color/orange_500</item>

    </integer-array>

</resources>

res/values/colors.xml

+7 −0
Original line number Diff line number Diff line
@@ -75,4 +75,11 @@ 


    <color name="wifi_divider">#ffe0e0e0</color>



    <!-- Multi-SIM colors -->

    <color name="blue_500">#5677fc</color>

    <color name="green_500">#259b24</color>

    <color name="purple_500">#9c27b0</color>

    <color name="red_500">#e51c23</color>

    <color name="orange_500">#ff9800</color>



</resources>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ 
    <dimen name="sim_dialog_margin_bottom">16dip</dimen>

    <!-- SIM Dialog padding -->

    <dimen name="sim_dialog_padding">8dip</dimen>

    <dimen name="sim_label_padding">16dip</dimen>

    <dimen name="sim_content_padding">12dip</dimen>

    <!-- Sim Card Name length -->

    <integer name="sim_name_length">32</integer>

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -5910,4 +5910,9 @@ 
    <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->

    <string name="display_auto_rotate_stay_in_current">Stay in current orientation</string>



    <!-- Title and summary for SIM Status -->

    <!-- Title for IMEI preference [CHAR LIMIT=30] -->

    <string name="imei_information_title">IMEI information</string>

    <!-- Description for IMEI preference [CHAR LIMIT=40] -->

    <string name="imei_information_summary">IMEI relative information</string>

</resources>