diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2013-09-19 04:27:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 04:27:58 +0000 |
| commit | 9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63 (patch) | |
| tree | 058eb3a7a8671c0361749bea96dfdbd7fd85e60b | |
| parent | b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b (diff) | |
| parent | 5df64b0a818d4f85cb14602db725f05b0055c1d9 (diff) | |
| download | android_packages_apps_Snap-9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63.tar.gz android_packages_apps_Snap-9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63.tar.bz2 android_packages_apps_Snap-9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63.zip | |
Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | res/mipmap-hdpi/ic_launcher_gallery.png | bin | 0 -> 20425 bytes | |||
| -rw-r--r-- | res/mipmap-mdpi/ic_launcher_gallery.png | bin | 0 -> 17130 bytes | |||
| -rw-r--r-- | res/mipmap-xhdpi/ic_launcher_gallery.png | bin | 0 -> 24283 bytes | |||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/util/ApiHelper.java | 2 |
6 files changed, 9 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1b082e432..b0381d681 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -48,6 +48,7 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:icon="@mipmap/ic_launcher_camera" android:label="@string/app_name" + android:logo="@mipmap/ic_launcher_gallery" android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/Theme.Camera" android:windowSoftInputMode="stateAlwaysHidden|adjustPan" > diff --git a/res/mipmap-hdpi/ic_launcher_gallery.png b/res/mipmap-hdpi/ic_launcher_gallery.png Binary files differnew file mode 100644 index 000000000..23ea99890 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_gallery.png diff --git a/res/mipmap-mdpi/ic_launcher_gallery.png b/res/mipmap-mdpi/ic_launcher_gallery.png Binary files differnew file mode 100644 index 000000000..e1a99498d --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_gallery.png diff --git a/res/mipmap-xhdpi/ic_launcher_gallery.png b/res/mipmap-xhdpi/ic_launcher_gallery.png Binary files differnew file mode 100644 index 000000000..79544a2b6 --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_gallery.png diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 46dc2ba1e..25dd38510 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -681,7 +681,12 @@ public class CameraActivity extends Activity switch (item.getItemId()) { case android.R.id.home: // ActionBar's Up/Home button was clicked - mFilmStripView.getController().goToFirstItem(); + if (ApiHelper.HAS_APP_GALLERY) { + startActivity(Intent.makeMainSelectorActivity( + Intent.ACTION_MAIN, Intent.CATEGORY_APP_GALLERY)); + } else { + mFilmStripView.getController().goToFirstItem(); + } return true; case R.id.action_delete: removeData(currentDataId); diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java index 271957ee1..a54477c93 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java @@ -22,6 +22,8 @@ import java.lang.reflect.Field; public class ApiHelper { public static final boolean AT_LEAST_16 = Build.VERSION.SDK_INT >= 16; + public static final boolean HAS_APP_GALLERY = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1; public static final boolean HAS_MEDIA_COLUMNS_WIDTH_AND_HEIGHT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; public static final boolean HAS_AUTO_FOCUS_MOVE_CALLBACK = |
