Skip to content

Commit

Permalink
UPDATE: Minor tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
oasisfeng committed Jul 9, 2019
1 parent 4e1156b commit f052d37
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 35 deletions.
3 changes: 1 addition & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
Expand All @@ -56,5 +55,5 @@ dependencies {
implementation(name: 'setup-wizard-lib-platform-release', ext: 'aar')

androidTestImplementation 'org.mockito:mockito-android:2.8.9'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test:runner:1.2.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import android.view.ViewGroup;
import android.widget.SearchView;

import com.oasisfeng.android.app.LifecycleFragment;
import com.oasisfeng.android.app.LifecycleViewModelFragment;
import com.oasisfeng.android.os.Loopers;
import com.oasisfeng.androidx.lifecycle.ViewModelProviders;
import com.oasisfeng.common.app.AppListProvider;
Expand All @@ -42,7 +42,7 @@

/** The main UI - App list */
@ParametersAreNonnullByDefault
public class AppListFragment extends LifecycleFragment {
public class AppListFragment extends LifecycleViewModelFragment {

@Override public void onCreate(final @Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
17 changes: 0 additions & 17 deletions assembly/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,12 @@
-dontwarn android.content.ContentResolver
-dontwarn android.content.IContentProvider

# For Google Error Prone (depended by Guava)
-dontwarn com.google.errorprone.annotations.*

# For android-restrostream library
-dontwarn java9.util.stream.**

# For Guava library
-dontwarn javax.annotation.**
-dontwarn sun.misc.Unsafe
-dontwarn com.google.common.**

# Remove verbose and debug logging
-assumenosideeffects class android.util.Log {
public static boolean isLoggable(java.lang.String, int);
public static int v(...);
}

# For @Keep to work
-keep @android.support.annotation.Keep class *
-keepclassmembers class * {
@android.support.annotation.Keep *;
}

# For generics reflection to work
-keepattributes Signature
-keepattributes *Annotation*
Expand Down
5 changes: 1 addition & 4 deletions installer/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@

<activity android:name=".AppInstallerActivity"
android:label="@string/app_installer_label"
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:configChanges="uiMode|orientation|screenSize|keyboard|keyboardHidden"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar">

<intent-filter> <!-- with MIME type -->
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.INSTALL_PACKAGE" />
Expand All @@ -19,7 +18,6 @@
<data android:scheme="content" />
<data android:mimeType="application/vnd.android.package-archive" />
</intent-filter>

<intent-filter> <!-- without MIME type -->
<action android:name="android.intent.action.INSTALL_PACKAGE" />
<category android:name="android.intent.category.DEFAULT" />
Expand All @@ -28,7 +26,6 @@
<data android:scheme="package" />
<data android:scheme="content" />
</intent-filter>

</activity>

<activity android:name=".AppInfoForwarderActivity"
Expand Down
10 changes: 0 additions & 10 deletions open/src/main/aidl/com/oasisfeng/island/IContainer.aidl

This file was deleted.

0 comments on commit f052d37

Please sign in to comment.