History log of /packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
228a7a0a902f3c023de797d0b06d033d8ec71502 16-Nov-2012 Angus Kong <shkong@google.com> Maintain aspect ratio of the preview on GB.

bug:7549150
Change-Id: I459bc5312fc9ebe71f1c77daeca9e6b77da82242
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
9713c56dfe1c298ab0c2c75d324dc69395d1c809 18-Sep-2012 Michael Kolb <kolby@google.com> Enable full screen preview

Bug: 7191461

Overscale preview texture to fill screen
Minor problem with face detection indicators
will be fixed later.
Change-Id: I5a93048564d69fe05f5a7aa7d6506dec8517e8ea
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
ce1d8396924bf4ca9be076cfdf9594c4d33ebd9b 08-Sep-2012 Michael Kolb <kolby@google.com> Add old panorama module

Bug: 7138809

Direct conversion of old panorama activity
Hiding switcher during panorama and video recording
Limited amount of switching between pano and other modes
due to memory leak

Change-Id: Id079b258d4b6eaaf000281bf86cd43633ea1528a
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
93c582e3d9a696b0821724b03fa985266d0dc878 19-Aug-2012 Wu-cheng Li <wuchengli@google.com> Improve the performance of swiping in gingerbread.

Avoid starting and stopping preview when swiping.
Set the size of the surface view to (1,1) instead.

bug:6927809

Change-Id: I14eaec3902ddc1d203702836cfa76240d2fec861
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
6266510aaa30184172aa1236bd4f88121db99288 16-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE in starting preview.

SurfaceView is initialized in main thread and camera start up
thread uses it. If camera thread uses it first, it will NPE.

bug:6927809

Change-Id: I1dbb892b9ef1a2bd0410b6c2664c1411e0f5c030
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
b598db1dcba5910e7c8fee424ddfc4f833403c29 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Set SURFACE_TYPE_PUSH_BUFFERS as surface holder type.

Without this, CameraService has "overlay create failed"
error in gingerbread.

bug:6927809

Change-Id: Ic927a378bc7be3f15600debb23c76aa9a23d6d31
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
0454f6a8dff47643a72fcdb668bd0b5100e4cec7 31-Jul-2012 Angus Kong <shkong@google.com> Use SurfaceView for MediaRecorder when API < 16.

Before API Level 16, we need to provide a SurfaceView to MediaRecorder
for preview when recording.

bug:6839752
Change-Id: I9e98e51517833b3cf92dd4ccbb8db33a80ab7288
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
3e1cbc8404a8ffe5cf6fae032363ef6c0ff78d54 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Only use mFaceView if it exists.

Change-Id: If31cf4a9c6676b2bccabc8a409524f9faf4abf76
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
cfa5ce94e6e67d046f52365374670c625eb037c1 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Only inflate the faceViewStub if it extsts.

Change-Id: Ic4c8d3325120834006120f012739a1b7356d21ab
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
29c6b08eea023aa834e66802b6171b8d33b2b7d8 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Do not use faceView if face detection is not supported.

Change-Id: Icd31a282fdaaec4834ef4abb1cf73268e5744a40
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
525667ff4b93a577298085fe45660a2d15b0bd06 17-Jul-2012 Angus Kong <shkong@google.com> Don't use View.addOnLayoutChangeListener.

bug:6831469
Change-Id: I9a46f70c1564194c9fbf4ccfb19e731fe0981201
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
64f9e54b860d158f8317bce7d4e8b6af5cbcfbab 20-Apr-2012 Pin Ting <pinting@google.com> Misc fixes and clean-up.

- Use getResources().getConfiguration().orientation to replace
getRequestedOrientation().
- Remove unused code.
- Fix outdated comment.
- Fix typo in variable names and comments.
- Fix coding style.

Change-Id: I81166ae2e4e99693e973227b323eaee68f6631db
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
a432c550acb06d2fea9f1d1f33055d914e0ee2bd 19-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove use of hidden API.

- KeyguardManager: isKeyguardLocked and isKeyguardSecure.
- View: mPaddingLeft, mPaddingRight, mPaddingTop, and
mPaddingBottom.

bug:5029099
Change-Id: Icfdae4a6d463377827e1469e0a5645b5698c821d
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
14eb2f01892cfe3945ecc4d431a7c134ded6ec17 12-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix focus indicator is not displayed.

- Use View.onSizeChanged to set the size of preview frame
layout. So we can make sure FocusManager always have
the correcnt and up-to-date preview frame layotu size.
- Refactor FocusManager to make it simpler.

Change-Id: Ic7d59cfc1f2b7edb97fbcf5ecfc3113514f4a4c4
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
892781804513066b68b4a2fa6f846e862dac252a 14-Mar-2012 Owen Lin <owenlin@google.com> Reorganize import for all files.

Change-Id: Ic56125055ff28f989ab4ad84f87736bbd15dd839
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
913f3784d368a5e11fee5d5db2c355ef832685da 03-Feb-2012 Wu-cheng Li <wuchengli@google.com> Fix warnings and remove unused code.

Change-Id: I1039edbc5a9990d44f5a629a18066805f370775e
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
ec38f8b0e662f945738ce31c7f70eb67300f960e 05-Jan-2012 akahuang <akahuang@google.com> Add border in viewfinder for photo capture.

bug:5420695
Change-Id: Id1d93cc84c3170a88d283679ad18dc453c4e0e80
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
da705aa1c8cbaaba105d9bc7799aef95c416a459 31-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5521540: UI Tweaks.

- draw fan-shaped semi-transparent area on the indicator wheel.
- change selected indicator color
- remove video mode black border
- set activity background to black
- update assets
- don't gray out unselected modes in mode picker (tablet)
- set ok/cancel icons to 32dp, font to 12sp bold

Change-Id: Iedc43dca29d1943965caf2d36cce176d8e509547
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
4c7b291018e08dbb4bc1712d95117a294fa1416c 26-Oct-2011 Wu-cheng Li <wuchengli@google.com> Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.

+ Move tablet resource to sw600dp and sw800dp

bug:5446617

Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
db3556078a75be0bd4a08195d90f060724034e88 19-Sep-2011 Chung-yih Wang <cywang@google.com> Fix indicator bar height in video mode.

bug:5287560
Change-Id: I000d11aa3974e1d48d18f4dcf6ec31166f6ef8ec
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
6a6cad85e4932ca6b3f00acd6617e9ad1701d13d 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Put a red border around the viewfinder during video snapshot.

Also remove the viewfinder border in all other cases.

bug:5187868

Change-Id: I4164fc9b0b62268b80496c71058466e03cbf0aa3
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
827192aefc4c75151dd389e1a1a5ebc8313d0164 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove unused files.

Change-Id: I8f7c34ddb1ffa1455131c51ff7d6522f3d94e402
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
940b813c57c6c6eb66f55d968c9cb2b28e79b24b 12-May-2011 Wu-cheng Li <wuchengli@google.com> Refactor preview frame layout.

Change-Id: Ief0acb3841078a36974e315054110bd9070a1f3f
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
d4594cafc86f8400012146abd48534aa9d68d92d 12-May-2011 Wu-cheng Li <wuchengli@google.com> Remove unused code and resource.

Change-Id: Ia6d98847716ef187eefd05758c5c61b530967b27
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
41ac285a1c97b1df78246456effb80de51033323 25-Nov-2010 Hung-ying Tyan <tyanh@google.com> Increase camera preview frame size and other changes.

+ Increase camera preview frame size and align it to the left of the screen.
+ Move thumbnail to the lower left corner of the preview frame.
+ Move GPS indicator to the lower right corner of the preview frame.
+ Replace LinearLayout and negative margin with RelativeLayout.
+ Revise the look of the settings wheel based on new UI mock.
+ Add border to preview frame.
+ Make settings popup windows align with an invisible view in the root view.
This makes it easier to adjust the location of the popup windows.

Bug: 3156693

Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
59ddc8c1add2fcffe523e3877baad1b6cc5ba2fb 22-Nov-2010 Chung-yih Wang <cywang@google.com> Add front/back camera switch

bug:3156676
Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
80715aae46e5a7a9aa378002301ba9d76f093776 16-Nov-2010 Wu-cheng Li <wuchengli@google.com> Add background for indicator wheel.

bug:3156688
Change-Id: I91465730cc2ac9c586122573c1ac73ba48cc0cc9
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
a2cbd31e81bf6b4a65ade4a5c34c303546d57d8c 11-Nov-2010 Hung-ying Tyan <tyanh@google.com> Move camera UI elements to their own xml files.

Hopefully with this CL, the code doesn't need to worry about the placement of
the UI elements.

Change details:
+ Move preview frame out of camera.xml and video_camera.xml.
--> create preview_frame.xml and preview_frame_video.xml in both layout/
and layout-xlarge/.
+ Move thumbnail list view out of camera.xml and video_camera.xml.
--> create thumbnail_list.xml in layout-xlarge/.
+ Make camera.xml and video_camera.xml a pure container which includes other
UI elements.
+ Create camera_attach.xml and video_camera_attach.xml for the attachment
scenario with its own camera control and no thumbnail list.
+ Camera and VideoCamera are modified accordingly.
+ Remove redundant RelativeLayout container in camera_control.xml.
+ Also fix a layout bug in PreviewFrameLayout.java.

Change-Id: Ief556c9aa77b0322312bb46ce1d274df3a26aa4d
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
02ec7c0880ded5863d73d6f173ef35ab5c888dcd 04-Nov-2010 Wu-cheng Li <wuchengli@google.com> Change setting picker to popup window.

UI was re-designed.
bug:3156666

Change-Id: Id40fab084f59cdeca8e2991dc8b3768fcac8e0bf
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
ec689e833e5730517d190a136710186a8f0c1445 09-Nov-2010 Hung-ying Tyan <tyanh@google.com> Add new layout file for camera.

+ Copied the layout file from res/layout and put it in res/layout-xlarge.
+ Changed FrameLayout to RelativeLayout in the new layout file.
+ Replace FrameLayout with View/ViewGroup in the code as it's not layout specific.

Bug: 3156684 (in progress)

Change-Id: Ife35528c08bc0e35793a0ff645ec9a7260c842c1
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
62bffb2f0ec34fba6f2e51087a307afa96c64dea 16-Oct-2010 Wu-cheng Li <wuchengli@google.com> Fix wrong aspect ratio of camera preview.

Surface view must match the preview size ratio. Deduct all
paddings while calculating the width and height of surface
view.

bug:3104492
Change-Id: I0d87a1c531f51fe74dd62b59f32dc40b1d1fb84d
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
82544b4564c079ece1a9065d19add36b2635bb8f 01-Apr-2010 Owen Lin <owenlin@google.com> Remove unused resources and code.

Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec 15-Mar-2010 Owen Lin <owenlin@google.com> Fix several UI issues.

1. Remove the cross in border_last_picture
2. Remove the gripper in VideoCamera
3. Solve the popup triangle locate in wrong position
4. Remove the top and bottom borders of the preview frame in Camera
5. Rotate the on-screen indicators when orientation changed
6. Add the checking for the flash mode in VideoCamera

Change-Id: I304ea3582d08c5e46ed750b7371588635a4d8009
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
e480f77352d670b2892a9b7b7cd503838b71ca9f 10-Mar-2010 Romain Guy <romainguy@android.com> Camera should have the com.android.camera package name.
Related to bug #2464545

Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
3889cf31101cfd4d336f1ce5ae5122c2cb3c0fdc 06-Mar-2010 Chih-Chung Chang <chihchung@google.com> Unbundle: change camera package name.

Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
271b3095b9f763421c0547109da9de774795072d 02-Nov-2009 Chih-Chung Chang <chihchung@google.com> Clean up and add comments for classes.
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
2bc4714bcd7233cd7a3fd0bb4aa261c48d2d9f79 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Fine tune some UI stuff.

1. Use no animation between camera / review mode. Thus, we must have same
layout for three types of control panel.

2. Since we have better algorithm to calculate the preview size. Let the
gripper be the same in mdpi and hdpi devices.

3. Keep some border on the right size of image view. Otherwise, it looks
odds in HVGA devices.

Change-Id: I65b13222cace230f09e6b33f311fd2b79758e93e
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
1f0564eb75f20943d496109928b5542902d3bd61 29-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2144865 by re-positioning the on-screen setting when the size of preview frame is changed.
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java
ffcca7403c9a364403357d3c76a3ff256c63c786 27-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Resize the preview frame as large as possible.

Now, we will calculate the layout by ourselves in PreviewFrameLayout.

Change-Id: I90f91f9df6d2f75fbd31fc930af624a84820bc95
/packages/apps/Camera/src/com/android/camera/PreviewFrameLayout.java