diff options
author | Arne Schwabe <arne@rfc2549.org> | 2012-05-04 00:28:52 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-04 00:28:52 +0200 |
commit | 3a1284b0635257df99840614c153e23ff3d99e80 (patch) | |
tree | 119750363771382ea684ed0f8cff6ac7c767ca1b /res | |
parent | 815eb143e98b57b6cd1f43c7c3007416ed4b1a91 (diff) |
Get vpn list working again, not yet perfect but at least delete works
http://code.google.com/p/android/issues/detail?id=3414 is hunting me :(
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/vpn_list_item.xml | 70 | ||||
-rw-r--r-- | res/menu/vpn_context.xml | 10 |
2 files changed, 78 insertions, 2 deletions
diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml new file mode 100644 index 0000000..dc6254e --- /dev/null +++ b/res/layout/vpn_list_item.xml @@ -0,0 +1,70 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:focusable="false" + android:minHeight="?android:attr/listPreferredItemHeight" > + + <LinearLayout + android:id="@+id/vpnconfig_pref" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?android:attr/selectableItemBackground" + android:gravity="center_vertical" > + + <LinearLayout + android:id="@android:id/widget_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" /> + + <TextView + android:id="@+android:id/vpn_item_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + + <View + android:layout_width="2dip" + android:layout_height="match_parent" + android:layout_marginBottom="5dip" + android:layout_marginTop="5dip" + android:background="@android:drawable/divider_horizontal_dark" /> + + <ImageView + android:id="@+id/quickedit_settings" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:focusable="true" + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/configure_the_vpn" + android:paddingLeft="15dip" + android:paddingRight="?android:attr/scrollbarSize" + android:src="@drawable/ic_sysbar_quicksettings" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml index ab68137..477c6a8 100644 --- a/res/menu/vpn_context.xml +++ b/res/menu/vpn_context.xml @@ -3,18 +3,24 @@ <item android:id="@+id/edit_vpn" + android:alphabeticShortcut="e" android:icon="@android:drawable/ic_menu_edit" android:showAsAction="withText|ifRoom" android:title="@string/edit_vpn"/> <item android:id="@+id/remove_vpn" + android:alphabeticShortcut="d" android:icon="@android:drawable/ic_menu_delete" android:showAsAction="withText|ifRoom" android:title="@string/remove_vpn"/> - <item + + <!-- does not look good on phone portrait with 3 items :( --> + <!-- <item android:id="@+id/connect_vpn" + android:alphabeticShortcut="c" + android: android:icon="@android:drawable/ic_media_play" android:showAsAction="withText|ifRoom" android:title="@string/connect"/> - + --> </menu>
\ No newline at end of file |