• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

packages/apps/Gallery2


Commit MetaInfo

修订版c86745dd27fb93baa1ec22796bb4af207b6b6182 (tree)
时间2018-03-29 03:48:18
作者Aurimas Liutikas <aurimas@goog...>
CommiterAurimas Liutikas

Log Message

Move Gallery2 to androidx.

Bug: 76692459
Test: make -j Gallery2 and run on emulator
Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8

更改概述

差异

--- a/Android.mk
+++ b/Android.mk
@@ -5,10 +5,10 @@ include $(CLEAR_VARS)
55 LOCAL_MODULE_TAGS := optional
66
77 LOCAL_STATIC_ANDROID_LIBRARIES := \
8- android-support-fragment \
9- android-support-core-ui \
10- android-support-compat \
11- android-support-v13
8+ androidx.fragment_fragment \
9+ androidx.legacy_legacy-support-core-ui \
10+ androidx.core_core \
11+ androidx.legacy_legacy-support-v13
1212
1313 LOCAL_STATIC_JAVA_LIBRARIES := \
1414 com.android.gallery3d.common2 \
--- a/res/layout/ingest_activity_item_list.xml
+++ b/res/layout/ingest_activity_item_list.xml
@@ -25,7 +25,7 @@
2525 android:choiceMode="multipleChoiceModal"
2626 android:stretchMode="columnWidth" />
2727
28- <android.support.v4.view.ViewPager
28+ <androidx.viewpager.widget.ViewPager
2929 android:id="@+id/ingest_view_pager"
3030 android:layout_width="match_parent"
3131 android:layout_height="match_parent"
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -32,7 +32,7 @@ import android.content.res.Configuration;
3232 import android.net.Uri;
3333 import android.os.Bundle;
3434 import android.os.IBinder;
35-import android.support.v4.print.PrintHelper;
35+import androidx.print.PrintHelper;
3636 import android.view.Menu;
3737 import android.view.MenuItem;
3838 import android.view.Window;
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -42,11 +42,11 @@ import android.os.Bundle;
4242 import android.os.CancellationSignal;
4343 import android.os.Handler;
4444 import android.os.IBinder;
45-import android.support.v4.app.DialogFragment;
46-import android.support.v4.app.Fragment;
47-import android.support.v4.app.FragmentActivity;
48-import android.support.v4.app.FragmentTransaction;
49-import android.support.v4.print.PrintHelper;
45+import androidx.fragment.app.DialogFragment;
46+import androidx.fragment.app.Fragment;
47+import androidx.fragment.app.FragmentActivity;
48+import androidx.fragment.app.FragmentTransaction;
49+import androidx.print.PrintHelper;
5050 import android.util.DisplayMetrics;
5151 import android.util.Log;
5252 import android.util.TypedValue;
--- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.category;
1919 import android.app.Activity;
2020 import android.graphics.Rect;
2121 import android.os.Bundle;
22-import android.support.v4.app.Fragment;
22+import androidx.fragment.app.Fragment;
2323 import android.view.LayoutInflater;
2424 import android.view.View;
2525 import android.view.ViewGroup;
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -17,8 +17,8 @@
1717 package com.android.gallery3d.filtershow.category;
1818
1919 import android.os.Bundle;
20-import android.support.v4.app.Fragment;
21-import android.support.v4.app.FragmentTransaction;
20+import androidx.fragment.app.Fragment;
21+import androidx.fragment.app.FragmentTransaction;
2222 import android.view.LayoutInflater;
2323 import android.view.View;
2424 import android.view.ViewGroup;
--- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.editors;
1818
1919 import android.app.Activity;
2020 import android.os.Bundle;
21-import android.support.v4.app.Fragment;
22-import android.support.v4.app.FragmentTransaction;
21+import androidx.fragment.app.Fragment;
22+import androidx.fragment.app.FragmentTransaction;
2323 import android.view.LayoutInflater;
2424 import android.view.View;
2525 import android.view.ViewGroup;
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -32,7 +32,7 @@ import android.graphics.Rect;
3232 import android.graphics.RectF;
3333 import android.graphics.Shader;
3434 import android.graphics.drawable.NinePatchDrawable;
35-import android.support.v4.widget.EdgeEffectCompat;
35+import androidx.core.widget.EdgeEffectCompat;
3636 import android.util.AttributeSet;
3737 import android.util.Log;
3838 import android.view.GestureDetector;
--- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java
+++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
@@ -20,7 +20,7 @@ import android.graphics.Bitmap;
2020 import android.graphics.Rect;
2121 import android.net.Uri;
2222 import android.os.Bundle;
23-import android.support.v4.app.DialogFragment;
23+import androidx.fragment.app.DialogFragment;
2424 import android.text.Html;
2525 import android.view.LayoutInflater;
2626 import android.view.View;
--- a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
+++ b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
@@ -17,7 +17,7 @@
1717 package com.android.gallery3d.filtershow.presets;
1818
1919 import android.os.Bundle;
20-import android.support.v4.app.DialogFragment;
20+import androidx.fragment.app.DialogFragment;
2121 import android.view.LayoutInflater;
2222 import android.view.View;
2323 import android.view.ViewGroup;
--- a/src/com/android/gallery3d/filtershow/state/StatePanel.java
+++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java
@@ -17,7 +17,7 @@
1717 package com.android.gallery3d.filtershow.state;
1818
1919 import android.os.Bundle;
20-import android.support.v4.app.Fragment;
20+import androidx.fragment.app.Fragment;
2121 import android.util.Log;
2222 import android.view.LayoutInflater;
2323 import android.view.View;
--- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
@@ -22,7 +22,7 @@ import android.graphics.Rect;
2222 import android.net.Uri;
2323 import android.os.Bundle;
2424 import android.os.Handler;
25-import android.support.v4.app.DialogFragment;
25+import androidx.fragment.app.DialogFragment;
2626 import android.text.Editable;
2727 import android.text.TextWatcher;
2828 import android.view.LayoutInflater;
--- a/src/com/android/gallery3d/ingest/IngestActivity.java
+++ b/src/com/android/gallery3d/ingest/IngestActivity.java
@@ -42,7 +42,7 @@ import android.os.Bundle;
4242 import android.os.Handler;
4343 import android.os.IBinder;
4444 import android.os.Message;
45-import android.support.v4.view.ViewPager;
45+import androidx.viewpager.widget.ViewPager;
4646 import android.util.SparseBooleanArray;
4747 import android.view.ActionMode;
4848 import android.view.Menu;
--- a/src/com/android/gallery3d/ingest/IngestService.java
+++ b/src/com/android/gallery3d/ingest/IngestService.java
@@ -37,7 +37,7 @@ import android.os.Binder;
3737 import android.os.Build;
3838 import android.os.IBinder;
3939 import android.os.SystemClock;
40-import android.support.v4.app.NotificationCompat;
40+import androidx.core.app.NotificationCompat;
4141 import android.util.SparseBooleanArray;
4242 import android.widget.Adapter;
4343
--- a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
+++ b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
@@ -25,7 +25,7 @@ import com.android.gallery3d.ingest.ui.MtpFullscreenView;
2525 import android.annotation.TargetApi;
2626 import android.content.Context;
2727 import android.os.Build;
28-import android.support.v4.view.PagerAdapter;
28+import androidx.viewpager.widget.PagerAdapter;
2929 import android.view.LayoutInflater;
3030 import android.view.View;
3131 import android.view.ViewGroup;
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -26,7 +26,7 @@ import android.content.DialogInterface.OnClickListener;
2626 import android.content.Intent;
2727 import android.os.Handler;
2828 import android.os.Message;
29-import android.support.v4.print.PrintHelper;
29+import androidx.print.PrintHelper;
3030 import android.view.Menu;
3131 import android.view.MenuItem;
3232
--- a/src/com/android/gallery3d/ui/TileImageView.java
+++ b/src/com/android/gallery3d/ui/TileImageView.java
@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
2121 import android.graphics.Point;
2222 import android.graphics.Rect;
2323 import android.graphics.RectF;
24-import android.support.v4.util.LongSparseArray;
24+import androidx.collection.LongSparseArray;
2525 import android.util.DisplayMetrics;
2626 import android.view.WindowManager;
2727
--- a/src/com/android/gallery3d/util/AccessibilityUtils.java
+++ b/src/com/android/gallery3d/util/AccessibilityUtils.java
@@ -17,7 +17,7 @@
1717 package com.android.gallery3d.util;
1818
1919 import android.content.Context;
20-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
20+import androidx.core.view.accessibility.AccessibilityRecordCompat;
2121 import android.view.View;
2222 import android.view.accessibility.AccessibilityEvent;
2323 import android.view.accessibility.AccessibilityManager;
--- a/src/com/android/photos/GalleryActivity.java
+++ b/src/com/android/photos/GalleryActivity.java
@@ -23,8 +23,8 @@ import android.app.Fragment;
2323 import android.app.FragmentTransaction;
2424 import android.content.Intent;
2525 import android.os.Bundle;
26-import android.support.v13.app.FragmentPagerAdapter;
27-import android.support.v4.view.ViewPager;
26+import androidx.legacy.app.FragmentPagerAdapter;
27+import androidx.viewpager.widget.ViewPager;
2828 import android.view.Menu;
2929 import android.view.MenuItem;
3030 import android.view.ViewGroup;
--- a/src/com/android/photos/views/GalleryThumbnailView.java
+++ b/src/com/android/photos/views/GalleryThumbnailView.java
@@ -20,10 +20,10 @@ import android.content.Context;
2020 import android.content.res.TypedArray;
2121 import android.database.DataSetObserver;
2222 import android.graphics.Canvas;
23-import android.support.v4.view.MotionEventCompat;
24-import android.support.v4.view.VelocityTrackerCompat;
25-import android.support.v4.view.ViewCompat;
26-import android.support.v4.widget.EdgeEffectCompat;
23+import androidx.core.view.MotionEventCompat;
24+import androidx.core.view.VelocityTrackerCompat;
25+import androidx.core.view.ViewCompat;
26+import androidx.core.widget.EdgeEffectCompat;
2727 import android.util.AttributeSet;
2828 import android.util.Log;
2929 import android.util.SparseArray;
--- a/src/com/android/photos/views/TiledImageRenderer.java
+++ b/src/com/android/photos/views/TiledImageRenderer.java
@@ -20,7 +20,7 @@ import android.content.Context;
2020 import android.graphics.Bitmap;
2121 import android.graphics.Rect;
2222 import android.graphics.RectF;
23-import android.support.v4.util.LongSparseArray;
23+import androidx.collection.LongSparseArray;
2424 import android.util.DisplayMetrics;
2525 import android.util.Log;
2626 import android.util.Pools.Pool;