diff options
author | darkobas <darkobas@gmail.com> | 2016-08-09 00:13:41 +0200 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-11-09 22:15:24 +0200 |
commit | 2b82f934e08925647d0774bc669968bfd79f2567 (patch) | |
tree | 8a452e9424772726455e24a8ba42a2e80ce2a6d5 | |
parent | e40dea81e73f14bf28d5aeb3e88a4029ab114428 (diff) | |
download | android_packages_apps_Snap-2b82f934e08925647d0774bc669968bfd79f2567.tar.gz android_packages_apps_Snap-2b82f934e08925647d0774bc669968bfd79f2567.tar.bz2 android_packages_apps_Snap-2b82f934e08925647d0774bc669968bfd79f2567.zip |
SnapdragonCamera: Panorama, replace border drawable
Change-Id: Ic86c7146f53b96e70259fd6da81050277ebda23b
-rw-r--r-- | res/drawable-hdpi/ic_pan_border_fast.9.png | bin | 479 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_pan_border_fast_large.9.png | bin | 1073 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_pan_border_fast_xlarge.9.png | bin | 1073 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_pan_border_fast.9.png | bin | 504 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_pan_border_fast_xlarge.9.png | bin | 784 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_pan_border_fast.9.png | bin | 611 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png | bin | 1362 -> 0 bytes | |||
-rw-r--r-- | res/drawable/ic_pan_border_fast.xml | 12 | ||||
-rw-r--r-- | res/layout/pano_module_capture.xml | 4 | ||||
-rw-r--r-- | res/values-large-hdpi/drawable.xml | 1 | ||||
-rw-r--r-- | res/values-sw600dp-hdpi/drawable.xml | 1 | ||||
-rw-r--r-- | res/values-sw640dp/drawable.xml | 1 | ||||
-rw-r--r-- | res/values-xlarge/drawable.xml | 1 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 4 |
14 files changed, 15 insertions, 9 deletions
diff --git a/res/drawable-hdpi/ic_pan_border_fast.9.png b/res/drawable-hdpi/ic_pan_border_fast.9.png Binary files differdeleted file mode 100644 index cbd617267..000000000 --- a/res/drawable-hdpi/ic_pan_border_fast.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pan_border_fast_large.9.png b/res/drawable-hdpi/ic_pan_border_fast_large.9.png Binary files differdeleted file mode 100644 index b0df823a9..000000000 --- a/res/drawable-hdpi/ic_pan_border_fast_large.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pan_border_fast_xlarge.9.png b/res/drawable-hdpi/ic_pan_border_fast_xlarge.9.png Binary files differdeleted file mode 100644 index b0df823a9..000000000 --- a/res/drawable-hdpi/ic_pan_border_fast_xlarge.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pan_border_fast.9.png b/res/drawable-mdpi/ic_pan_border_fast.9.png Binary files differdeleted file mode 100644 index 1435c31a0..000000000 --- a/res/drawable-mdpi/ic_pan_border_fast.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pan_border_fast_xlarge.9.png b/res/drawable-mdpi/ic_pan_border_fast_xlarge.9.png Binary files differdeleted file mode 100644 index 332441e02..000000000 --- a/res/drawable-mdpi/ic_pan_border_fast_xlarge.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pan_border_fast.9.png b/res/drawable-xhdpi/ic_pan_border_fast.9.png Binary files differdeleted file mode 100644 index 1006961f5..000000000 --- a/res/drawable-xhdpi/ic_pan_border_fast.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png b/res/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png Binary files differdeleted file mode 100644 index 9eeaa4765..000000000 --- a/res/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png +++ /dev/null diff --git a/res/drawable/ic_pan_border_fast.xml b/res/drawable/ic_pan_border_fast.xml new file mode 100644 index 000000000..c5da6c8d5 --- /dev/null +++ b/res/drawable/ic_pan_border_fast.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:strokeWidth="0.1" + android:fillColor="@color/red" + android:pathData="M11,15H13V17H11V15M11,7H13V13H11V7M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20Z" /> +</vector> diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index c6ea2b22a..7b2108484 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -33,8 +33,8 @@ <View android:id="@+id/pano_preview_area_border" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="64dp" + android:layout_height="64dp" android:background="@drawable/ic_pan_border_fast" android:visibility="gone" /> diff --git a/res/values-large-hdpi/drawable.xml b/res/values-large-hdpi/drawable.xml index 7c0c8d5e0..584ffbf18 100644 --- a/res/values-large-hdpi/drawable.xml +++ b/res/values-large-hdpi/drawable.xml @@ -15,7 +15,6 @@ --> <resources> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item> - <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item> <item name="ic_pan_progression" type="drawable">@drawable/ic_pan_progression_large</item> diff --git a/res/values-sw600dp-hdpi/drawable.xml b/res/values-sw600dp-hdpi/drawable.xml index 7c0c8d5e0..584ffbf18 100644 --- a/res/values-sw600dp-hdpi/drawable.xml +++ b/res/values-sw600dp-hdpi/drawable.xml @@ -15,7 +15,6 @@ --> <resources> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item> - <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item> <item name="ic_pan_progression" type="drawable">@drawable/ic_pan_progression_large</item> diff --git a/res/values-sw640dp/drawable.xml b/res/values-sw640dp/drawable.xml index 648f1d7fd..0fe233444 100644 --- a/res/values-sw640dp/drawable.xml +++ b/res/values-sw640dp/drawable.xml @@ -15,7 +15,6 @@ --> <resources> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_xlarge</item> - <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item> <item name="ic_pan_progression" type="drawable">@drawable/ic_pan_progression_xlarge</item> diff --git a/res/values-xlarge/drawable.xml b/res/values-xlarge/drawable.xml index 648f1d7fd..0fe233444 100644 --- a/res/values-xlarge/drawable.xml +++ b/res/values-xlarge/drawable.xml @@ -15,7 +15,6 @@ --> <resources> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_xlarge</item> - <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item> <item name="ic_pan_progression" type="drawable">@drawable/ic_pan_progression_xlarge</item> diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index f3b30db1c..523abe411 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -393,9 +393,6 @@ public class WideAnglePanoramaUI implements mTextureView.setLayoutParams(param); mTextureView.setX(xOffset); mTextureView.setY(yOffset); - mPreviewBorder.setLayoutParams(param); - mPreviewBorder.setX(xOffset); - mPreviewBorder.setY(yOffset); mPreviewYOffset = yOffset; mTextureView.layout(0, mPreviewYOffset, mTextureView.getRight(), mTextureView.getBottom()); @@ -711,6 +708,7 @@ public class WideAnglePanoramaUI implements mPanoFailedDialog.setRotation(-orientation); mReview.setRotation(-orientation); mTooFastPrompt.setRotation(-orientation); + mPreviewBorder.setRotation(-orientation); mCameraControls.setOrientation(orientation, animation); RotateTextToast.setOrientation(orientation); } |