Commit e273ca9e authored by Wang Han's avatar Wang Han Committed by LuK1337

Gallery2: Migrate remaining bits to AndroidX

Change-Id: I2cfb6152e90516cf8acedb1dbd5c45fdbbfb04d1
parent d8608164
......@@ -7,7 +7,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_ANDROID_LIBRARIES := \
$(ANDROID_SUPPORT_DESIGN_TARGETS) \
com.google.android.material_material \
androidx.annotation_annotation \
androidx.fragment_fragment \
androidx.heifwriter_heifwriter \
androidx.legacy_legacy-support-core-ui \
......
......@@ -44,13 +44,6 @@
# Disable the warnings of using dynamic method calls in EffectsRecorder
-dontnote com.android.camera.EffectsRecorder
# Required for ActionBarSherlock
-keep class android.support.v4.app.** { *; }
-keep interface android.support.v4.app.** { *; }
-keep class com.actionbarsherlock.** { *; }
-keep interface com.actionbarsherlock.** { *; }
-keepattributes *Annotation*
# Required for mp4parser
-keep public class * implements com.coremedia.iso.boxes.Box
......
......@@ -56,7 +56,7 @@
</RelativeLayout>
<!-- Bottom bar -->
<android.support.design.widget.BottomNavigationView
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -28,7 +28,7 @@
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ToolbarTheme">
......@@ -42,4 +42,4 @@
android:titleTextAppearance="@style/ToolbarTitleStyle"
android:popupTheme="@style/ToolbarPopUpTheme" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
......@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.BottomNavigationView;
import androidx.drawerlayout.widget.DrawerLayout;
import android.text.TextUtils;
import android.util.Log;
......@@ -62,6 +61,8 @@ import com.android.gallery3d.data.Path;
import com.android.gallery3d.picasasource.PicasaSource;
import com.android.gallery3d.util.GalleryUtils;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import java.util.Locale;
public final class GalleryActivity extends AbstractGalleryActivity implements OnCancelListener {
......
......@@ -33,11 +33,12 @@ import android.app.Activity;
import android.content.res.Configuration;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.Nullable;
import org.codeaurora.gallery.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.EditorCrop;
......
......@@ -31,13 +31,14 @@ package com.android.gallery3d.filtershow.category;
import android.content.res.Resources;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.Nullable;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.filters.FiltersManager;
......
......@@ -31,9 +31,10 @@ package com.android.gallery3d.filtershow.category;
import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.View;
import androidx.annotation.Nullable;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.Editor;
......
......@@ -34,7 +34,7 @@ import android.app.Activity;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.view.View;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.TrueScannerEditor;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment