select public key refactored

This commit is contained in:
Dominik committed 2012-11-01 18:50:41 +01:00
1 parent 182524bb96
commit f50d71559d
14 files changed
+488 -524

No files matched your search

-45
View File
@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<include
android:id="@+id/layout_filter"
layout="@layout/filter_info" />
<ExpandableListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:isScrollContainer="true" />
<TextView
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_weight="1"
android:background="@drawable/abs__ab_bottom_solid_light_holo"
android:paddingBottom="3dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="3dp"
android:text="@string/listInformation" />
</LinearLayout>
@@ -1,13 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true" >
android:orientation="vertical" >
<fragment
android:id="@+id/public_key_list_fragment"
android:id="@+id/key_list_public_fragment"
android:name="org.thialfihar.android.apg.ui.KeyListPublicFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_weight="1" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_weight="1"
android:background="@drawable/abs__ab_bottom_solid_light_holo"
android:paddingBottom="3dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="3dp"
android:text="@string/listInformation" />
</LinearLayout>
@@ -1,13 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true" >
android:orientation="vertical" >
<fragment
android:id="@+id/secret_key_list_fragment"
android:id="@+id/key_list_secret_fragment"
android:name="org.thialfihar.android.apg.ui.KeyListSecretFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_weight="1" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_weight="1"
android:background="@drawable/abs__ab_bottom_solid_light_holo"
android:paddingBottom="3dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="3dp"
android:text="@string/listInformation" />
</LinearLayout>
-35
View File
@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:orientation="vertical" >
<include
android:id="@+id/layout_filter"
layout="@layout/filter_info" />
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:choiceMode="multipleChoice" />
</LinearLayout>
@@ -6,7 +6,7 @@
<fragment
android:id="@+id/select_public_key_fragment"
android:name="org.thialfihar.android.apg.ui.SelectPublicKeyListFragment"
android:name="org.thialfihar.android.apg.ui.SelectPublicKeyFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -46,7 +46,7 @@
<TextView
android:id="@+id/mainUserIdRest"
android:text="&lt;user@somewhere.com&gt;"
android:text="&lt;user@example.com&gt;"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>