git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

(root) / android-x86 / packages-apps-Camera2.git / log

Baligh Uddin [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]

am a4a3b647: (-s ours) am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a4a3b647921cf595ca57c422d00fd2cbcaf3e247':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]

am 0c9822f3: am fd696d77: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release()

* commit '0c9822f377fdb8f1e01375b3535d2dfb77d7c160':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 05:42:34 +0000 (05:42 +0000)]

am 67c78543: am fe297a35: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations

* commit '67c785431164b2afa5ed2750a244436e1da74a03':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]

am 2b2c9c29: am 8d5639bf: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier

* commit '2b2c9c2998c86ee284aa597a67d8ccc9df705282':

commit | commitdiff | tree

Andy Huibers [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]

am d5d61e9e: am 556370c3: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.

* commit 'd5d61e9efecb68234b5b216849ec2bed1bbf8a5f':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:32 +0000 (05:42 +0000)]

am e8c58ca5: am 6956d11a: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier

* commit 'e8c58ca5e95c9e20bf0ff7e6f85229a6f5b4f1b4':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]

am 406b3d1f: am 051fddec: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier

* commit '406b3d1fa83f5497e49cc8bc3adaf83cb8154414':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]

am cac9f0a2: am dbfd18d2: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.

* commit 'cac9f0a2a52aa9d70ff678204eb8b041b8176618':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:30 +0000 (05:42 +0000)]

am 8c6eda78: am 90665968: am 3f8c75b2: am da6f3acc: Skip disk caching for session data

* commit '8c6eda78be7603847b313e9be059346e4e9f8c93':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]

am 041d20ec: am 87d802c2: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier

* commit '041d20ec22456ac6c525a4f72d3f7707787331eb':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]

am 80d6250c: am 45cf7b25: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi

* commit '80d6250cabde4dfceac343a7e5e1c43e47246232':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:28 +0000 (05:42 +0000)]

am b193c857: am d6567402: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability

* commit 'b193c857c2699319cdacb0e1575c91a416d91fbc':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 05:42:27 +0000 (05:42 +0000)]

am 42a20015: am 10279d29: am 3e8f9db9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures

* commit '42a20015c3055afc312f94846d9a43144fc1f860':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]

am 19193b9d: am 03a2759c: am e31c82c2: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier

* commit '19193b9d4d975d4ad179ab7c8f3411496145a732':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]

am 12a535ec: am 78bd5555: am 4c571d7e: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier

* commit '12a535ec491ec9e20a6825e5e1ef7927fc7aedd1':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:25 +0000 (05:42 +0000)]

am 29d21bfb: am 4c1e6e8f: am b4ed71c2: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code

* commit '29d21bfbaf0c590bd9680a0e93d034d03e41d82d':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:24 +0000 (05:42 +0000)]

am c72106ed: am 306a986c: am 42b799ac: am 8f1ffed7: am b2b0e02c: Clean up unused code

* commit 'c72106edf3572137e79b9f74a2d53c3fa298602a':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:42:23 +0000 (05:42 +0000)]

am 5677ac23: am 2d4b0949: (-s ours) am d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"

* commit '5677ac239cfab0b0feb959b0fe783048d472796b':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 05:36:28 +0000 (05:36 +0000)]

am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '97750cc8eff73e2d3826739894f40950dcd2691f':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:36:27 +0000 (05:36 +0000)]

am fd696d77: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release()

* commit 'fd696d77ab1bd1e4b3dd4f3ec74744ef29f22bc3':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 05:36:26 +0000 (05:36 +0000)]

am fe297a35: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations

* commit 'fe297a353be6c363870f67cc84597ceecd6cef85':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:36:24 +0000 (05:36 +0000)]

am 8d5639bf: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier

* commit '8d5639bf7fb4d1be533ed60aa5a17271901b8fcb':

commit | commitdiff | tree

Andy Huibers [Mon, 27 Oct 2014 05:36:23 +0000 (05:36 +0000)]

am 556370c3: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.

* commit '556370c333c5e522f0b3118af45440ca91d4702f':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:21 +0000 (05:36 +0000)]

am 6956d11a: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier

* commit '6956d11a742e3f19d63a7f318a750dd91362d17f':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 05:36:20 +0000 (05:36 +0000)]

am 051fddec: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier

* commit '051fddec10fc62788d6a50d2a9133ce99a26251a':

commit | commitdiff | tree

Senpo Hu [Mon, 27 Oct 2014 05:36:19 +0000 (05:36 +0000)]

am dbfd18d2: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.

* commit 'dbfd18d24e748d9b6d20ca20abb6be5812a00916':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:17 +0000 (05:36 +0000)]

am 90665968: am 3f8c75b2: am da6f3acc: Skip disk caching for session data

* commit '90665968526c8bf039686a8fa6ab3bd296e056d0':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:16 +0000 (05:36 +0000)]

am 87d802c2: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier

* commit '87d802c2fc7a9052e667ce895b7bae37bdbe7390':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:15 +0000 (05:36 +0000)]

am 45cf7b25: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi

* commit '45cf7b2546aff7c9bf406b1dc648e6f7b56bf84e':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:13 +0000 (05:36 +0000)]

am d6567402: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability

* commit 'd6567402bce2705528bf271008d5166b8f49dd56':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 05:36:12 +0000 (05:36 +0000)]

am 10279d29: am 3e8f9db9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures

* commit '10279d29063c1976b341f2d8ca9772684cd363df':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 05:36:11 +0000 (05:36 +0000)]

am 03a2759c: am e31c82c2: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier

* commit '03a2759c642203985e59106e33ff460df0cf6523':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:09 +0000 (05:36 +0000)]

am 78bd5555: am 4c571d7e: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier

* commit '78bd55551657d78e43375439f45b6cbf3424308e':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:08 +0000 (05:36 +0000)]

am 4c1e6e8f: am b4ed71c2: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code

* commit '4c1e6e8f040e60be33c2c044246bddcb5d38a354':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:06 +0000 (05:36 +0000)]

am 306a986c: am 42b799ac: am 8f1ffed7: am b2b0e02c: Clean up unused code

* commit '306a986c73f24f15b1093590e9cd9a94db869b02':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 05:36:05 +0000 (05:36 +0000)]

am 2d4b0949: (-s ours) am d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"

* commit '2d4b0949cf60ec96162bb3436df35db61abd6e09':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 04:34:09 +0000 (04:34 +0000)]

am 7eb9e062: (-s ours) am 8929aecc: (-s ours) am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '7eb9e0629bf53bf7d9c050cccb252e0789c8aac8':

commit | commitdiff | tree

Jiawen Chen [Mon, 27 Oct 2014 04:34:08 +0000 (04:34 +0000)]

am 484375dd: am 0a9e31f5: am 6dfb91e0: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '484375dda2adbcbeb9389efb2c9d3a8b63cc4870':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 04:34:07 +0000 (04:34 +0000)]

am 2df3de6f: am 04408f74: am 2aa7189d: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '2df3de6fea68410b6709d0a81d9ffae18006e255':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:34:07 +0000 (04:34 +0000)]

am 74fb79f8: am 9e6b902f: am 11c70fb3: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '74fb79f8a7a4e9e6bc37820acac0df254a3137b2':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:34:06 +0000 (04:34 +0000)]

am bee1f5ab: am 037e25a6: am f608095c: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit 'bee1f5ab503ad62b65d67d04ca18eb5e6d0bb56f':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:34:05 +0000 (04:34 +0000)]

am 1e391c0b: am 0d9b4776: am 0f44eb07: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.

* commit '1e391c0bd5c4e525ad28293217ee7336fcee5835':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:34:04 +0000 (04:34 +0000)]

am 44202558: am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit '442025589db979185f23c4ea6a479c3f027b16f2':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 04:34:04 +0000 (04:34 +0000)]

am 1003077a: (-s ours) am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1003077aa045b6c4bff64d8b8fa5a579ded13132':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 04:34:03 +0000 (04:34 +0000)]

am 8c7cc87e: am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

* commit '8c7cc87eca5cec68e3aad7bea9425a202c203014':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:34:02 +0000 (04:34 +0000)]

am 657664a9: am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

* commit '657664a9f43614459a46017dad169af34a6f9e14':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 04:21:37 +0000 (04:21 +0000)]

am 8929aecc: (-s ours) am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '8929aeccd3772d9a4cf1a1ddbd91562952638825':

commit | commitdiff | tree

Jiawen Chen [Mon, 27 Oct 2014 04:21:35 +0000 (04:21 +0000)]

am 0a9e31f5: am 6dfb91e0: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '0a9e31f5bfd4bf4044f090b209c8fbf39356cee7':

commit | commitdiff | tree

Alan Newberger [Mon, 27 Oct 2014 04:21:33 +0000 (04:21 +0000)]

am 04408f74: am 2aa7189d: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '04408f74cee92e6712d548ce10561562f4e5248d':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:21:32 +0000 (04:21 +0000)]

am 9e6b902f: am 11c70fb3: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '9e6b902fcb0b350159fd3dfd3eea9f481cb6ef07':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:21:30 +0000 (04:21 +0000)]

am 037e25a6: am f608095c: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit '037e25a68613cc95add0e8da3f39f820ddee4ab8':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:21:28 +0000 (04:21 +0000)]

am 0d9b4776: am 0f44eb07: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.

* commit '0d9b4776f5300bf451533df628cde15c4d826565':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:21:26 +0000 (04:21 +0000)]

am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit '23f27f22033525b5ea428a4a387ae528502759dc':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 04:21:24 +0000 (04:21 +0000)]

am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6eba768550a5fe7c3dba506bdaf19c6de83b3819':

commit | commitdiff | tree

Puneet Lall [Mon, 27 Oct 2014 04:21:22 +0000 (04:21 +0000)]

am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

* commit '38827648c2fae431b106c8845bfb7be49d67ecab':

commit | commitdiff | tree

Spike Sprague [Mon, 27 Oct 2014 04:21:20 +0000 (04:21 +0000)]

am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

* commit '023a45e82a1cf7486d7a142308f27b5683b9c238':

commit | commitdiff | tree

Senpo Hu [Sat, 25 Oct 2014 02:33:50 +0000 (02:33 +0000)]

am f2d18ca0: am 1c5f87e4: am 8fb9e06b: Adopt the new error handling mechanism in portability.

* commit 'f2d18ca0069a57e2d4354c460b7b145b9db8c5ce':
Adopt the new error handling mechanism in portability.

commit | commitdiff | tree

Senpo Hu [Fri, 24 Oct 2014 21:34:35 +0000 (21:34 +0000)]

am 1c5f87e4: am 8fb9e06b: Adopt the new error handling mechanism in portability.

* commit '1c5f87e4b6a5d2c7c25449fd84f09c999e1046dd':
Adopt the new error handling mechanism in portability.

commit | commitdiff | tree

Senpo Hu [Fri, 24 Oct 2014 20:12:49 +0000 (20:12 +0000)]

am 8fb9e06b: Adopt the new error handling mechanism in portability.

* commit '8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25':
Adopt the new error handling mechanism in portability.

commit | commitdiff | tree

Senpo Hu [Tue, 7 Oct 2014 01:35:44 +0000 (18:35 -0700)]

Adopt the new error handling mechanism in portability.

Show camera fatal dialog to guide users exiting the app when
1) camera framework throws RTE or
2) DispatchThread job is timeout.

If users hit home button while error dialog is shown, just exit
the app.

Bug: 16189216
Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65

Conflicts:
src/com/android/camera/CameraActivity.java

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 13:16:05 +0000 (06:16 -0700)]

Import translations. DO NOT MERGE

Change-Id: Idcfa92fed757530d6fcb3d4b323804be0b965841
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 22:42:45 +0000 (22:42 +0000)]

am 4162c991: (-s ours) am 5e4a50d3: (-s ours) am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '4162c9915bfff0632504ae28d9f39dc4ab2a8788':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 22:34:59 +0000 (22:34 +0000)]

am 5e4a50d3: (-s ours) am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '5e4a50d3bf220af8c8e5170ef0e0115595c582d6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 22:28:29 +0000 (22:28 +0000)]

am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '0d283729f3cb0bdc3f5afd992e5f49e56d1e5728':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 22:23:46 +0000 (22:23 +0000)]

am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '9d87600a24c9b9b1c7a1d85b46971dba51d48e2c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 22:17:06 +0000 (22:17 +0000)]

am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '91bceebd0bb15a5d20d43f8eca808114b96eb5ce':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 20:43:09 +0000 (13:43 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9aa9830e9e60b0a774c9001f6cd5bb48f7c7d0cd
Auto-generated-cl: translation import

commit | commitdiff | tree

Neil Fuller [Fri, 17 Oct 2014 15:36:50 +0000 (15:36 +0000)]

am 50cd017d: resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp

* commit '50cd017d439aed15eaa6da4e4767cff7e9b9532c':
Remove dependencies on FloatMath

commit | commitdiff | tree

Neil Fuller [Fri, 17 Oct 2014 15:30:05 +0000 (16:30 +0100)]

resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp

Change-Id: I48ff6962b8b24f6b9714a660e706b35336a99a06

commit | commitdiff | tree

Neil Fuller [Fri, 17 Oct 2014 15:14:57 +0000 (15:14 +0000)]

Merge "Remove dependencies on FloatMath"

commit | commitdiff | tree

Geoff Mendal [Tue, 14 Oct 2014 00:25:56 +0000 (17:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: I619f23160f7f403272293d70cc1821e560011ebc
Auto-generated-cl: translation import

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 21:29:46 +0000 (21:29 +0000)]

am c749dddf: am d0501b04: am 55157d27: am cc933608: am 2d440350: Update to use real L codename.

* commit 'c749dddf4853dcd01954e394cd37bf1b51458d3e':
Update to use real L codename.

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 17:15:11 +0000 (17:15 +0000)]

am d0501b04: am 55157d27: am cc933608: am 2d440350: Update to use real L codename.

* commit 'd0501b049bd9b979fdef671df2e3115b7403bb34':
Update to use real L codename.

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 00:41:37 +0000 (00:41 +0000)]

am 55157d27: am cc933608: am 2d440350: Update to use real L codename.

* commit '55157d27305d06569f0bd7d3c47ec51855f87da4':
Update to use real L codename.

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 00:30:45 +0000 (00:30 +0000)]

am cc933608: am 2d440350: Update to use real L codename.

* commit 'cc93360812c822eb4cac8056a0848c74338b3776':
Update to use real L codename.

commit | commitdiff | tree

Dianne Hackborn [Thu, 9 Oct 2014 19:29:30 +0000 (19:29 +0000)]

am 2d440350: Update to use real L codename.

* commit '2d4403500d0bb55794aecbe9a33a03dd09f8ea0a':
Update to use real L codename.

commit | commitdiff | tree

Dianne Hackborn [Wed, 8 Oct 2014 16:37:44 +0000 (09:37 -0700)]

Update to use real L codename.

Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 01:03:39 +0000 (01:03 +0000)]

am 11c307b2: am 017050a5: am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit

* commit '11c307b29af21336e8d4367e154c346c4b130ef6':
Fix preference copy migration and incorrect HDR+ sticky bit

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:55:26 +0000 (00:55 +0000)]

am 017050a5: am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit

* commit '017050a539676b08da5df0e478d706b04ff081e2':
Fix preference copy migration and incorrect HDR+ sticky bit

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:34:26 +0000 (00:34 +0000)]

am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit

* commit 'd014ce874af7d21e527213d65070af17905ecf36':
Fix preference copy migration and incorrect HDR+ sticky bit

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:20:54 +0000 (00:20 +0000)]

am dd897b39: am ca29a477: am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit 'dd897b39cd8562b3dfbb526736a1dcdab49ddc75':
Fix incorrect key translation in Settings refactor

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:20:29 +0000 (00:20 +0000)]

am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit

* commit '4912326305fbd05fe7ceff82aa2d2ecbd9f3127a':
Fix preference copy migration and incorrect HDR+ sticky bit

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:13:23 +0000 (00:13 +0000)]

am ca29a477: am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit 'ca29a477126fb0c849155cce3c998f8c4f44fe4c':
Fix incorrect key translation in Settings refactor

commit | commitdiff | tree

Alan Newberger [Tue, 7 Oct 2014 00:05:33 +0000 (00:05 +0000)]

am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit 'f4c28525f56c34d0659d6b0657fc15289814905d':
Fix incorrect key translation in Settings refactor

commit | commitdiff | tree

Alan Newberger [Mon, 6 Oct 2014 23:52:35 +0000 (23:52 +0000)]

am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit

* commit '7ba23fed935fa796c9c76b16c9bae79bf3f8b969':
Fix preference copy migration and incorrect HDR+ sticky bit

commit | commitdiff | tree

Alan Newberger [Mon, 6 Oct 2014 23:51:09 +0000 (23:51 +0000)]

am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit '0424d26413389555335ac941de632a1afa1485b7':
Fix incorrect key translation in Settings refactor

commit | commitdiff | tree

Alan Newberger [Mon, 6 Oct 2014 22:35:20 +0000 (22:35 +0000)]

am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit '0ac0b733d510fc17d072c61055c0e2ad446689ff':
Fix incorrect key translation in Settings refactor

commit | commitdiff | tree

Alan Newberger [Mon, 6 Oct 2014 15:54:09 +0000 (08:54 -0700)]

Fix preference copy migration and incorrect HDR+ sticky bit

A sticky bit upgrader particularly for HDR+ was looking in
globals but was actually a module setting. The copy migrator
was not properly handling booleans! Modified the copy migrator
to properly handle supported types and removed the custom
incorrect upgrader.

Bug: 17875895
Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
(cherry picked from commit 90672aa08379e598426c12b529a86afd4b61011e)

commit | commitdiff | tree

Alan Newberger [Mon, 6 Oct 2014 21:20:50 +0000 (21:20 +0000)]

Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 6 Oct 2014 15:54:00 +0000 (08:54 -0700)]

Import translations. DO NOT MERGE

Change-Id: I65c06993baa5710a7d559820a4c3fa3fb36c77a1
Auto-generated-cl: translation import

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:21:04 +0000 (19:21 +0000)]

am 4b80f1d0: am 2101ab4b: am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev

* commit '4b80f1d03532f629f934618b659fd865da8ebd14':
Trap CameraAgentFactory RTEs during recycle

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:21:03 +0000 (19:21 +0000)]

am 8989fae6: am 450cef14: am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev

* commit '8989fae6bf5e7a7aa67986d13d2c78368f01e483':
Trap camera close exceptions on pause

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:16:22 +0000 (19:16 +0000)]

am 2101ab4b: am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev

* commit '2101ab4b214a2a92ee32ce42d799192e46e71ea4':
Trap CameraAgentFactory RTEs during recycle

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:16:21 +0000 (19:16 +0000)]

am 450cef14: am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev

* commit '450cef14657b876fa30d9c31cf35e1ce80611cde':
Trap camera close exceptions on pause

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:11:31 +0000 (19:11 +0000)]

am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev

* commit 'b1a810b21391ff37db16e08f705bb968142ac146':
Trap CameraAgentFactory RTEs during recycle

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:11:30 +0000 (19:11 +0000)]

am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev

* commit 'ead83e3eeb6c28944afe59594a90a99c75bf2daf':
Trap camera close exceptions on pause

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:06:52 +0000 (19:06 +0000)]

am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev

* commit 'c6dfd6093850f93cd54987c6ec3613a80b2bf641':
Trap CameraAgentFactory RTEs during recycle

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:06:52 +0000 (19:06 +0000)]

am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev

* commit '57177a77c9c872779ef93332f53958c82634381d':
Trap camera close exceptions on pause

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:02:50 +0000 (19:02 +0000)]

am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev

* commit 'd30fdee360db38e93e4639bd1c28049d0b6b09e0':
Trap CameraAgentFactory RTEs during recycle

commit | commitdiff | tree

Alan Newberger [Sun, 5 Oct 2014 19:02:49 +0000 (19:02 +0000)]

am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev

* commit 'b0be8f5321605380110ca03a3ae6880b042fe187':
Trap camera close exceptions on pause

packages/apps/Camera2

RSS Atom

About OSDN

Find Software

Develop Software

Help