diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index e79a75fca..b45e891dc 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -1,18 +1,24 @@
+
+ xmlns:tools="http://schemas.android.com/tools"
+ package="org.fdroid.fdroid.tests"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+
-
-
-
+
+
+
+
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 9a241f133..7387a300a 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,8 @@
+
-
+
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 6593e0f3b..305c3c707 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -1,4 +1,5 @@
+
+ package="org.fdroid.fdroid"
+ android:installLocation="auto">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:name=".nearby.SwapWorkflowActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:label="@string/swap"
+ android:launchMode="singleTask"
+ android:parentActivityName=".views.main.MainActivity"
+ android:screenOrientation="portrait">
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
+
+ android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+ android:resource="@xml/device_filter" />
-
+
-
+
+ android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"
+ android:resource="@xml/device_filter" />
@@ -120,51 +159,20 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98695de24..4b62ea827 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
+
+ xmlns:tools="http://schemas.android.com/tools"
+ package="org.fdroid.fdroid"
+ android:installLocation="auto">
+ android:anyDensity="true"
+ android:largeScreens="true"
+ android:normalScreens="true"
+ android:resizeable="true"
+ android:smallScreens="true"
+ android:xlargeScreens="true" />
+ android:name="android.hardware.telephony"
+ android:required="false" />
-
+ android:name="android.hardware.wifi"
+ android:required="false" />
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:name=".FDroidApp"
+ android:allowBackup="true"
+ android:description="@string/app_description"
+ android:fullBackupContent="@xml/backup_rules"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:networkSecurityConfig="@xml/network_security_config"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.App">
+ android:name=".privileged.views.InstallConfirmActivity"
+ android:configChanges="layoutDirection|locale"
+ android:excludeFromRecents="true"
+ android:label="@string/menu_install"
+ android:parentActivityName=".views.main.MainActivity">
-
-
-
-
-
-
-
-
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
+ android:name=".privileged.views.UninstallDialogActivity"
+ android:excludeFromRecents="true" />
+
+
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:name=".NfcNotEnabledActivity"
+ android:configChanges="layoutDirection|locale"
+ android:noHistory="true" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -429,11 +364,11 @@
This filter supports HTTP and HTTPS schemes. There is an additional filter for
fdroidrepo:// and fdroidrepos://
-->
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
-
-
-
-
-
+ android:name="android.app.searchable"
+ android:resource="@xml/searchable" />
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/org/fdroid/fdroid/AboutActivity.java b/app/src/main/java/org/fdroid/fdroid/AboutActivity.java
deleted file mode 100644
index f0d5677c2..000000000
--- a/app/src/main/java/org/fdroid/fdroid/AboutActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.fdroid.fdroid;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-public class AboutActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.about);
-
- String versionName = Utils.getVersionName(this);
- if (versionName != null) {
- ((TextView) findViewById(R.id.version)).setText(versionName);
- }
-
- findViewById(R.id.ok_button).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- finish();
- }
- });
- }
-}
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index a19483892..b129a2fa0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -844,11 +844,6 @@ public class AppDetailsRecyclerViewAdapter
protected void updateExpandableItem(boolean isExpanded) {
final int icon = getIcon();
Drawable iconDrawable = ContextCompat.getDrawable(headerView.getContext(), icon);
- if (icon == R.drawable.ic_access_time) {
- assert iconDrawable != null;
- iconDrawable = DrawableCompat.wrap(iconDrawable).mutate();
- DrawableCompat.setTint(iconDrawable, Color.parseColor("#B4B4B4"));
- }
final Drawable expandLess = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_less);
final Drawable expandMore = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_more);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView,
@@ -877,7 +872,7 @@ public class AppDetailsRecyclerViewAdapter
@DrawableRes
protected int getIcon() {
- return R.drawable.ic_access_time;
+ return R.drawable.ic_versions;
}
}
@@ -888,7 +883,7 @@ public class AppDetailsRecyclerViewAdapter
super(view);
headerView = (TextView) view.findViewById(R.id.information);
final Drawable accessTime = DrawableCompat.wrap(ContextCompat.getDrawable(headerView.getContext(),
- R.drawable.ic_access_time)).mutate();
+ R.drawable.ic_versions)).mutate();
DrawableCompat.setTint(accessTime, Color.parseColor("#B4B4B4"));
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView,
accessTime, null, null, null);
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
index 6d90edf14..f3bb912e7 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
@@ -125,7 +125,7 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
sortImage = (ImageView) findViewById(R.id.sort);
final Drawable lastUpdated = DrawableCompat.wrap(ContextCompat.getDrawable(this,
- R.drawable.ic_access_time)).mutate();
+ R.drawable.ic_last_updated)).mutate();
DrawableCompat.setTint(lastUpdated, FDroidApp.isAppThemeLight() ? Color.BLACK : Color.WHITE);
final Drawable words = DrawableCompat.wrap(ContextCompat.getDrawable(AppListActivity.this,
R.drawable.ic_sort)).mutate();
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_last_updated.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_access_time.xml
rename to app/src/main/res/drawable/ic_last_updated.xml
diff --git a/app/src/main/res/drawable/ic_versions.xml b/app/src/main/res/drawable/ic_versions.xml
new file mode 100644
index 000000000..fe48a2b22
--- /dev/null
+++ b/app/src/main/res/drawable/ic_versions.xml
@@ -0,0 +1,15 @@
+
+
+
+