summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-05-18 13:47:56 +0800
committerLikai Ding <likaid@codeaurora.org>2016-06-03 15:34:47 +0800
commit711aee7790ab995e61231e836bfe36a38f65cfce (patch)
tree761cfc107c9d8647be8f19946c29bf540b30f24f /src/com/android/gallery3d
parentc83b5b7faee8117f7f83ca931db0040610ace976 (diff)
downloadandroid_packages_apps_Gallery2-711aee7790ab995e61231e836bfe36a38f65cfce.tar.gz
android_packages_apps_Gallery2-711aee7790ab995e61231e836bfe36a38f65cfce.tar.bz2
android_packages_apps_Gallery2-711aee7790ab995e61231e836bfe36a38f65cfce.zip
Gallery: SystemProperties wrapper
CRs-Fixed: 986672 Change-Id: I84c1c24604ef2bb5890e8054f4a8ef9b43f1a07e
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/app/GalleryActivity.java20
-rw-r--r--src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java3
-rw-r--r--src/com/android/gallery3d/ui/TimeLineSlotView.java8
3 files changed, 11 insertions, 20 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index fd233e5f9..9f3c5f493 100644
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -19,8 +19,7 @@
package com.android.gallery3d.app;
-import java.util.Locale;
-import android.os.Handler;
+import android.Manifest;
import android.app.Dialog;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -32,40 +31,34 @@ import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import android.Manifest;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.os.SystemProperties;
import android.provider.MediaStore;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v4.widget.DrawerLayout.DrawerListener;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.InputDevice;
import android.view.LayoutInflater;
-import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
+import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
-import android.view.View.OnClickListener;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
-import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.Toolbar;
-import android.widget.Toolbar.OnMenuItemClickListener;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.DrawerLayout.DrawerListener;
-import android.text.TextUtils;
-import java.util.ArrayList;
import org.codeaurora.gallery.R;
+import com.android.gallery3d.common.ApiHelper.SystemProperties;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.DataManager;
import com.android.gallery3d.data.MediaItem;
@@ -80,6 +73,9 @@ import com.android.gallery3d.util.GalleryUtils;
import com.android.gallery3d.util.ThreadPool.Job;
import com.android.gallery3d.util.ThreadPool.JobContext;
+import java.util.ArrayList;
+import java.util.Locale;
+
public final class GalleryActivity extends AbstractGalleryActivity implements OnCancelListener {
public static final String EXTRA_SLIDESHOW = "slideshow";
public static final String EXTRA_DREAM = "dream";
diff --git a/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java
index c8a05ae38..3a31b4bfa 100644
--- a/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java
@@ -20,6 +20,7 @@ package com.android.gallery3d.filtershow.filters;
import android.graphics.Bitmap;
import android.util.Log;
+import com.android.gallery3d.common.ApiHelper.SystemProperties;
import com.thundersoft.hz.selfportrait.detect.FaceDetect;
import com.thundersoft.hz.selfportrait.detect.FaceInfo;
@@ -27,7 +28,7 @@ public abstract class SimpleMakeupImageFilter extends SimpleImageFilter {
private static final String LOGTAG = "SimpleMakeupImageFilter";
protected static final int MAKEUP_INTENSITY = 50;
- public static final boolean HAS_TS_MAKEUP = android.os.SystemProperties.getBoolean("persist.ts.postmakeup", true);
+ public static final boolean HAS_TS_MAKEUP = SystemProperties.getBoolean("persist.ts.postmakeup", true);
public SimpleMakeupImageFilter() {
}
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotView.java b/src/com/android/gallery3d/ui/TimeLineSlotView.java
index 81fc3a57c..bac5a0e4d 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotView.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotView.java
@@ -20,8 +20,6 @@ package com.android.gallery3d.ui;
import android.graphics.Rect;
import android.text.TextUtils;
-import android.util.Log;
-import android.os.SystemProperties;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
@@ -29,14 +27,10 @@ import android.view.animation.DecelerateInterpolator;
import com.android.gallery3d.anim.Animation;
import com.android.gallery3d.app.AbstractGalleryActivity;
+import com.android.gallery3d.common.ApiHelper.SystemProperties;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.MediaItem;
-import com.android.gallery3d.data.MediaObject;
import com.android.gallery3d.glrenderer.GLCanvas;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.Locale;
public class TimeLineSlotView extends GLView {