diff options
Diffstat (limited to 'packages/VpnDialogs/res/layout')
| -rw-r--r-- | packages/VpnDialogs/res/layout/confirm.xml | 43 | ||||
| -rw-r--r-- | packages/VpnDialogs/res/layout/manage.xml | 45 |
2 files changed, 7 insertions, 81 deletions
diff --git a/packages/VpnDialogs/res/layout/confirm.xml b/packages/VpnDialogs/res/layout/confirm.xml index ee7f4b8..66fec59 100644 --- a/packages/VpnDialogs/res/layout/confirm.xml +++ b/packages/VpnDialogs/res/layout/confirm.xml @@ -18,41 +18,12 @@ <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" + <TextView android:id="@+id/warning" + android:layout_width="fill_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:paddingRight="1mm"/> - - <TextView android:id="@+id/prompt" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textSize="18sp"/> - </LinearLayout> - - <TextView android:id="@+id/warning" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - 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:text="@string/accept" - android:textSize="20sp" - android:filterTouchesWhenObscured="true" - android:checked="false"/> - </LinearLayout> + android:textSize="18sp" + android:paddingTop="4mm" + android:paddingLeft="3mm" + android:paddingRight="3mm" + android:paddingBottom="4mm"/> </ScrollView> diff --git a/packages/VpnDialogs/res/layout/manage.xml b/packages/VpnDialogs/res/layout/manage.xml deleted file mode 100644 index 56332c3..0000000 --- a/packages/VpnDialogs/res/layout/manage.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="3mm" - android:stretchColumns="0,1" - android:shrinkColumns="1"> - - <TableRow> - <TextView android:text="@string/session" style="@style/label"/> - <TextView android:id="@+id/session" style="@style/value"/> - </TableRow> - - <TableRow> - <TextView android:text="@string/duration" style="@style/label"/> - <TextView android:id="@+id/duration" style="@style/value"/> - </TableRow> - - <TableRow android:id="@+id/data_transmitted_row" android:visibility="gone"> - <TextView android:text="@string/data_transmitted" style="@style/label"/> - <TextView android:id="@+id/data_transmitted" style="@style/value"/> - </TableRow> - - <TableRow android:id="@+id/data_received_row" android:visibility="gone"> - <TextView android:text="@string/data_received" style="@style/label"/> - <TextView android:id="@+id/data_received" style="@style/value"/> - </TableRow> - -</TableLayout> |