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

Commit 9d1c1835 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "VpnDialogs: revise UI layout."

parents 84da4e47 72fddaa5

packages/VpnDialogs/res/layout/confirm.xml

+39 −42
Original line number Diff line number Diff line
@@ -15,46 +15,43 @@ 
     limitations under the License.

-->



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

        android:layout_width="wrap_content"

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

    <LinearLayout android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:padding="3mm">



        <LinearLayout android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:gravity="center_vertical">



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

                    android:layout_width="@android:dimen/app_icon_size"

                    android:layout_height="@android:dimen/app_icon_size"

            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:layout_marginRight="1mm"/>

                    android:paddingRight="1mm"/>



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

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

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"

            android:layout_alignParentLeft="true"

            android:layout_alignParentRight="true"

            android:layout_below="@id/icon"

            android:padding="3mm"

            android:text="@string/warning"

                    android:textSize="18sp"/>

        </LinearLayout>



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

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

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_alignParentRight="true"

            android:layout_toRightOf="@id/icon"

            android:layout_above="@id/warning"

            android:gravity="center_vertical"

            android:textSize="20sp"/>

                android:paddingTop="1mm"

                android:paddingBottom="1mm"

                android:text="@string/warning"

                android:textSize="18sp"/>



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

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

            android:layout_alignParentLeft="true"

            android:layout_alignParentRight="true"

            android:layout_below="@id/warning"

                android:text="@string/accept"

                android:textSize="20sp"

                android:checked="false"/>



</RelativeLayout>
 
    </LinearLayout>

</ScrollView>

packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java

+4 −2
Original line number Diff line number Diff line
@@ -181,9 +181,11 @@ public class ManageDialog extends Activity implements Handler.Callback, 
                String line = in.readLine().trim();

                if (line.startsWith(prefix)) {

                    String[] numbers = line.substring(prefix.length()).split(" +");

                    if (numbers.length == 17) {

                    for (int i = 1; i < 17; ++i) {

                        if (!numbers[i].equals("0")) {

                            return numbers;

                        }

                    }

                    break;

                }

            }