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

Commit 5520ca7f authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Update Premium-SMS detection UI. 

Colorize.
Add the undo-instruction string.
Fix the dialog layout.

bug: 7205024
Change-Id: I1334d431273467af6971544dc81913bebe743335
parent a8afa694

core/res/res/layout/sms_short_code_confirmation_dialog.xml

+44 −19
Original line number Diff line number Diff line
@@ -33,29 +33,54 @@ 
        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"/>

        android:paddingBottom="16dip" />



    <LinearLayout android:id="@+id/sms_short_code_detail_layout"

        android:layout_width="match_parent"

    <TableLayout android:id="@+id/sms_short_code_detail_layout"

        android:shrinkColumns="1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:gravity="center_vertical"

        android:minHeight="@dimen/alert_dialog_title_height"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip">

        android:paddingLeft="16dip"

        android:paddingRight="16dip">



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >



            <ImageView android:id="@+id/sms_short_code_coins_icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingLeft="8dip"

                android:paddingRight="8dip"

                android:src="@null" />

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

                style="?android:attr/textAppearanceMedium"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        </LinearLayout>

        </TableRow>



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >



            <CheckBox android:id="@+id/sms_short_code_remember_choice_checkbox"

        android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingRight="8dip" />

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

        </TableRow>



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >



            <Space android:layout_gravity="fill" />

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        </TableRow>



    </TableLayout>



</LinearLayout>

core/res/res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -3100,15 +3100,18 @@ 
    <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->

    <string name="sms_short_code_confirm_message">&lt;b><xliff:g id="app_name">%1$s</xliff:g>&lt;/b> would like to send a message to &lt;b><xliff:g id="dest_address">%2$s</xliff:g>&lt;/b>.</string>

    <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->

    <string name="sms_short_code_details">This may cause charges on your mobile account.</string>

    <string name="sms_short_code_details">This <font fgcolor="#ffffb060">may cause charges</font> on your mobile account.</string>

    <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->

    <string name="sms_premium_short_code_details">This will cause charges on your mobile account.</string>

    <string name="sms_premium_short_code_details"><font fgcolor="#ffffb060">This will cause charges on your mobile account.</font></string>

    <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->

    <string name="sms_short_code_confirm_allow">Send</string>

    <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->

    <string name="sms_short_code_confirm_deny">Cancel</string>

    <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->

    <string name="sms_short_code_remember_choice">Remember my choice</string>

    <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->

    <string name="sms_short_code_remember_undo_instruction">You can change this later in Settings\u00A0>\u00A0Apps"</string>



    <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->

    <string name="sms_short_code_confirm_always_allow">Always Allow</string>

    <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
  <java-symbol type="id" name="sms_short_code_detail_layout" />

  <java-symbol type="id" name="sms_short_code_detail_message" />

  <java-symbol type="id" name="sms_short_code_remember_choice_checkbox" />

  <java-symbol type="id" name="sms_short_code_remember_undo_instruction" />



  <java-symbol type="attr" name="actionModeShareDrawable" />

  <java-symbol type="attr" name="alertDialogCenterButtons" />
@@ -754,6 +755,7 @@ 
  <java-symbol type="string" name="sms_short_code_confirm_message" />

  <java-symbol type="string" name="sms_short_code_details" />

  <java-symbol type="string" name="sms_premium_short_code_details" />

  <java-symbol type="string" name="sms_short_code_remember_undo_instruction" />

  <java-symbol type="string" name="submit" />

  <java-symbol type="string" name="sync_binding_label" />

  <java-symbol type="string" name="sync_do_nothing" />