OSDN > Developer > crni_pjotr > Chamber > packages-apps-Gallery2 > 提交

packages-apps-Gallery2
Fork

Fork origin: android-x86 / packages-apps-Gallery2

R/O
HTTP
SSH
HTTPS

提交

Commit MetaInfo

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

Log Message

Move Gallery2 to androidx.

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

更改概述

modified: Android.mk (diff)
modified: res/layout/ingest_activity_item_list.xml (diff)
modified: src/com/android/gallery3d/app/AbstractGalleryActivity.java (diff)
modified: src/com/android/gallery3d/filtershow/FilterShowActivity.java (diff)
modified: src/com/android/gallery3d/filtershow/category/CategoryPanel.java (diff)
modified: src/com/android/gallery3d/filtershow/category/MainPanel.java (diff)
modified: src/com/android/gallery3d/filtershow/editors/EditorPanel.java (diff)
modified: src/com/android/gallery3d/filtershow/imageshow/ImageShow.java (diff)
modified: src/com/android/gallery3d/filtershow/info/InfoPanel.java (diff)
modified: src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java (diff)
modified: src/com/android/gallery3d/filtershow/state/StatePanel.java (diff)
modified: src/com/android/gallery3d/filtershow/ui/ExportDialog.java (diff)
modified: src/com/android/gallery3d/ingest/IngestActivity.java (diff)
modified: src/com/android/gallery3d/ingest/IngestService.java (diff)
modified: src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java (diff)
modified: src/com/android/gallery3d/ui/MenuExecutor.java (diff)
modified: src/com/android/gallery3d/ui/TileImageView.java (diff)
modified: src/com/android/gallery3d/util/AccessibilityUtils.java (diff)
modified: src/com/android/photos/GalleryActivity.java (diff)
modified: src/com/android/photos/views/GalleryThumbnailView.java (diff)
modified: src/com/android/photos/views/TiledImageRenderer.java (diff)

差异

--- a/Android.mk

+++ b/Android.mk

		@@ -5,10 +5,10 @@ include $(CLEAR_VARS)
5	5	LOCAL_MODULE_TAGS := optional
6	6
7	7	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
12	12
13	13	LOCAL_STATIC_JAVA_LIBRARIES := \
14	14	com.android.gallery3d.common2 \

--- a/res/layout/ingest_activity_item_list.xml

+++ b/res/layout/ingest_activity_item_list.xml

		@@ -25,7 +25,7 @@
25	25	android:choiceMode="multipleChoiceModal"
26	26	android:stretchMode="columnWidth" />
27	27
28		- <android.support.v4.view.ViewPager
	28	+ <androidx.viewpager.widget.ViewPager
29	29	android:id="@+id/ingest_view_pager"
30	30	android:layout_width="match_parent"
31	31	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;
32	32	import android.net.Uri;
33	33	import android.os.Bundle;
34	34	import android.os.IBinder;
35		-import android.support.v4.print.PrintHelper;
	35	+import androidx.print.PrintHelper;
36	36	import android.view.Menu;
37	37	import android.view.MenuItem;
38	38	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;
42	42	import android.os.CancellationSignal;
43	43	import android.os.Handler;
44	44	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;
50	50	import android.util.DisplayMetrics;
51	51	import android.util.Log;
52	52	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;
19	19	import android.app.Activity;
20	20	import android.graphics.Rect;
21	21	import android.os.Bundle;
22		-import android.support.v4.app.Fragment;
	22	+import androidx.fragment.app.Fragment;
23	23	import android.view.LayoutInflater;
24	24	import android.view.View;
25	25	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 @@
17	17	package com.android.gallery3d.filtershow.category;
18	18
19	19	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;
22	22	import android.view.LayoutInflater;
23	23	import android.view.View;
24	24	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;
18	18
19	19	import android.app.Activity;
20	20	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;
23	23	import android.view.LayoutInflater;
24	24	import android.view.View;
25	25	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;
32	32	import android.graphics.RectF;
33	33	import android.graphics.Shader;
34	34	import android.graphics.drawable.NinePatchDrawable;
35		-import android.support.v4.widget.EdgeEffectCompat;
	35	+import androidx.core.widget.EdgeEffectCompat;
36	36	import android.util.AttributeSet;
37	37	import android.util.Log;
38	38	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;
20	20	import android.graphics.Rect;
21	21	import android.net.Uri;
22	22	import android.os.Bundle;
23		-import android.support.v4.app.DialogFragment;
	23	+import androidx.fragment.app.DialogFragment;
24	24	import android.text.Html;
25	25	import android.view.LayoutInflater;
26	26	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 @@
17	17	package com.android.gallery3d.filtershow.presets;
18	18
19	19	import android.os.Bundle;
20		-import android.support.v4.app.DialogFragment;
	20	+import androidx.fragment.app.DialogFragment;
21	21	import android.view.LayoutInflater;
22	22	import android.view.View;
23	23	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 @@
17	17	package com.android.gallery3d.filtershow.state;
18	18
19	19	import android.os.Bundle;
20		-import android.support.v4.app.Fragment;
	20	+import androidx.fragment.app.Fragment;
21	21	import android.util.Log;
22	22	import android.view.LayoutInflater;
23	23	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;
22	22	import android.net.Uri;
23	23	import android.os.Bundle;
24	24	import android.os.Handler;
25		-import android.support.v4.app.DialogFragment;
	25	+import androidx.fragment.app.DialogFragment;
26	26	import android.text.Editable;
27	27	import android.text.TextWatcher;
28	28	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;
42	42	import android.os.Handler;
43	43	import android.os.IBinder;
44	44	import android.os.Message;
45		-import android.support.v4.view.ViewPager;
	45	+import androidx.viewpager.widget.ViewPager;
46	46	import android.util.SparseBooleanArray;
47	47	import android.view.ActionMode;
48	48	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;
37	37	import android.os.Build;
38	38	import android.os.IBinder;
39	39	import android.os.SystemClock;
40		-import android.support.v4.app.NotificationCompat;
	40	+import androidx.core.app.NotificationCompat;
41	41	import android.util.SparseBooleanArray;
42	42	import android.widget.Adapter;
43	43

--- 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;
25	25	import android.annotation.TargetApi;
26	26	import android.content.Context;
27	27	import android.os.Build;
28		-import android.support.v4.view.PagerAdapter;
	28	+import androidx.viewpager.widget.PagerAdapter;
29	29	import android.view.LayoutInflater;
30	30	import android.view.View;
31	31	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;
26	26	import android.content.Intent;
27	27	import android.os.Handler;
28	28	import android.os.Message;
29		-import android.support.v4.print.PrintHelper;
	29	+import androidx.print.PrintHelper;
30	30	import android.view.Menu;
31	31	import android.view.MenuItem;
32	32

--- a/src/com/android/gallery3d/ui/TileImageView.java

+++ b/src/com/android/gallery3d/ui/TileImageView.java

		@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
21	21	import android.graphics.Point;
22	22	import android.graphics.Rect;
23	23	import android.graphics.RectF;
24		-import android.support.v4.util.LongSparseArray;
	24	+import androidx.collection.LongSparseArray;
25	25	import android.util.DisplayMetrics;
26	26	import android.view.WindowManager;
27	27

--- a/src/com/android/gallery3d/util/AccessibilityUtils.java

+++ b/src/com/android/gallery3d/util/AccessibilityUtils.java

		@@ -17,7 +17,7 @@
17	17	package com.android.gallery3d.util;
18	18
19	19	import android.content.Context;
20		-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
	20	+import androidx.core.view.accessibility.AccessibilityRecordCompat;
21	21	import android.view.View;
22	22	import android.view.accessibility.AccessibilityEvent;
23	23	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;
23	23	import android.app.FragmentTransaction;
24	24	import android.content.Intent;
25	25	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;
28	28	import android.view.Menu;
29	29	import android.view.MenuItem;
30	30	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;
20	20	import android.content.res.TypedArray;
21	21	import android.database.DataSetObserver;
22	22	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;
27	27	import android.util.AttributeSet;
28	28	import android.util.Log;
29	29	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;
20	20	import android.graphics.Bitmap;
21	21	import android.graphics.Rect;
22	22	import android.graphics.RectF;
23		-import android.support.v4.util.LongSparseArray;
	23	+import androidx.collection.LongSparseArray;
24	24	import android.util.DisplayMetrics;
25	25	import android.util.Log;
26	26	import android.util.Pools.Pool;

packages-apps-Gallery2 Fork

提交

标签

Frequently used words (click to add to your profile)

Commit MetaInfo

Log Message

更改概述

差异

packages-apps-Gallery2
Fork