Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use right theme in InstallConfirmActivity, cleanup

Browse Source
This commit is contained in:
Dominik Schürmann 2015-05-20 17:42:11 +02:00
parent 8e62d9ae7e
commit 62a4d58756
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/AndroidManifest.xml
View File

@ -294,7 +294,7 @@
</activity> </activity>
<activity <activity
android:name=".installer.InstallConfirmActivity" android:name=".installer.InstallConfirmActivity"
android:label="" android:label="@string/menu_install"
android:parentActivityName=".FDroid"> android:parentActivityName=".FDroid">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"

2
F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
View File

@ -421,7 +421,7 @@ public class AppSecurityPermissions {
private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags, private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags,
int existingReqFlags) { int existingReqFlags) {
final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; final int base = pInfo.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE;
final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL); final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);
final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS); final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS);
final boolean isRequired = final boolean isRequired =

3
F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
View File

@ -39,6 +39,7 @@ import android.widget.ImageView;
import android.widget.TabHost; import android.widget.TabHost;
import android.widget.TextView; import android.widget.TextView;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
public class InstallConfirmActivity extends Activity implements OnCancelListener, OnClickListener { public class InstallConfirmActivity extends Activity implements OnCancelListener, OnClickListener {
@ -208,6 +209,8 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener
protected void onCreate(Bundle icicle) { protected void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
((FDroidApp) getApplication()).applyTheme(this);
mPm = getPackageManager(); mPm = getPackageManager();
intent = getIntent(); intent = getIntent();

2
F-Droid/src/org/fdroid/fdroid/installer/Installer.java
View File

@ -115,7 +115,7 @@ abstract public class Installer {
} }
} }
// Fallback -> DefaultInstaller // else -> DefaultInstaller
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
// Default installer on Android >= 4.0 // Default installer on Android >= 4.0
try { try {