82af6fc60e
Phew, monster merge. Going to commit after *seemingly* resolving conflicts, but it will no doubt take a few compile and runs to sort out any funny stuff. Conflicts: AndroidManifest.xml res/layout/addrepo.xml res/layout/appdetails.xml res/layout/repolisticons.xml res/values/strings.xml src/org/fdroid/fdroid/DB.java src/org/fdroid/fdroid/FDroid.java src/org/fdroid/fdroid/ManageRepo.java src/org/fdroid/fdroid/UpdateService.java
53 lines
1.9 KiB
XML
53 lines
1.9 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<LinearLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/vw1"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<ImageView android:id="@+id/img"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<LinearLayout
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<TextView android:id="@+id/uri"
|
|
android:textSize="21sp"
|
|
android:textStyle="bold"
|
|
android:singleLine="true"
|
|
android:ellipsize="marquee"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"/>
|
|
|
|
<TextView android:id="@+id/fingerprint"
|
|
android:textSize="14sp"
|
|
android:typeface="monospace"
|
|
android:singleLine="false"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"/>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
<!--
|
|
* Copyright (C) 2009 Roberto Jacinto
|
|
* roberto.jacinto@caixamagica.pt
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
--> |