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

Owen Lin [Mon, 21 May 2012 19:41:15 +0000 (12:41 -0700)]

am d1539278: am 616a70fd: Add transition animation for tapping from PhotoPage.

* commit 'd1539278b70ce37380ad531b51ea67398b77e916':
Add transition animation for tapping from PhotoPage.

commit | commitdiff | tree

Owen Lin [Mon, 21 May 2012 19:41:10 +0000 (12:41 -0700)]

am c7d4c59e: am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev

* commit 'c7d4c59e9827580214f5c3b78742dd51b19a0da8':
Set the window backgrond and remove it in onCreate().

commit | commitdiff | tree

Angus Kong [Mon, 21 May 2012 19:40:54 +0000 (12:40 -0700)]

am 7b329a0a: am 9723770a: Revert "Support Panorama preview."

* commit '7b329a0af29f75ae759eab03070ef070cb4c5f76':
Revert "Support Panorama preview."

commit | commitdiff | tree

Angus Kong [Mon, 21 May 2012 19:40:53 +0000 (12:40 -0700)]

am ade3b48c: am 41832d9f: Support Panorama preview.

* commit 'ade3b48caa971faa71345a033f23c01b9ac70302':
Support Panorama preview.

commit | commitdiff | tree

Ray Chen [Mon, 21 May 2012 19:39:57 +0000 (12:39 -0700)]

am f798a30a: am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev

* commit 'f798a30a9eb8ed2c3e5b20d2ed8727c743c95d39':
Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053

commit | commitdiff | tree

Ray Chen [Mon, 21 May 2012 19:39:48 +0000 (12:39 -0700)]

am 75f615f7: am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev

* commit '75f615f7826e825edddc38c17768499438f6df79':
Fix 6479216 Playing a video should go full-screen first

commit | commitdiff | tree

Yuli Huang [Mon, 21 May 2012 18:52:56 +0000 (11:52 -0700)]

am f6dc92aa: am 5338d195: Smooth opening animation by modifying interpolation curve.

* commit 'f6dc92aa29172236aa4c994b7eaac65d8fef2f52':
Smooth opening animation by modifying interpolation curve.

commit | commitdiff | tree

Yuli Huang [Fri, 18 May 2012 03:56:44 +0000 (20:56 -0700)]

am 327ce0f5: am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev

* commit '327ce0f5baec28a581f562473f6e0dd2ef596a26':
Fix card effect shown in opening animation.

commit | commitdiff | tree

Chih-Chung Chang [Fri, 18 May 2012 03:56:38 +0000 (20:56 -0700)]

am 585c1c6c: am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev

* commit '585c1c6c4d4741a76fae468262bac021a1e16884':
Handle layout change between pausing and resuming.

commit | commitdiff | tree

Owen Lin [Fri, 18 May 2012 03:56:30 +0000 (20:56 -0700)]

am 2b1b6b24: am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev

* commit '2b1b6b249e8aea9e1f9366de780d3c54f6273304':
Remove the black layer in MovieActivity.

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 22:32:46 +0000 (15:32 -0700)]

am 3b3968b5: am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev

* commit '3b3968b54d766e73da8d43e37d5db8942298b661':
Fix a dead lock while we freeze the screen.

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 22:32:32 +0000 (15:32 -0700)]

am 84664904: am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev

* commit '846649046510b9ac75210d7618b2192d40c7a739':
Hide the share button if the shared URI is not "content:".

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 20:06:12 +0000 (13:06 -0700)]

am 616a70fd: Add transition animation for tapping from PhotoPage.

* commit '616a70fdb4473d2fbd7b70772a3a82b908aeae1e':
Add transition animation for tapping from PhotoPage.

commit | commitdiff | tree

Owen Lin [Mon, 7 May 2012 08:35:53 +0000 (16:35 +0800)]

Add transition animation for tapping from PhotoPage.

bug:6383694
Change-Id: Ib457d6b636dafd3f8ef7340bfa85725f14d90bd0

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 19:47:35 +0000 (12:47 -0700)]

am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev

* commit '59d6f1b97c7159dd9faead8872f2d583dbb49ac8':
Set the window backgrond and remove it in onCreate().

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 19:44:51 +0000 (12:44 -0700)]

Merge "Set the window backgrond and remove it in onCreate()." into jb-dev

commit | commitdiff | tree

Angus Kong [Thu, 17 May 2012 18:52:51 +0000 (11:52 -0700)]

am 9723770a: Revert "Support Panorama preview."

* commit '9723770a40d230092204dd685f19ff4bce6dabd5':
Revert "Support Panorama preview."

commit | commitdiff | tree

Angus Kong [Thu, 17 May 2012 18:51:03 +0000 (11:51 -0700)]

am 41832d9f: Support Panorama preview.

* commit '41832d9f1568c7d8227fb9ffebaf7830345cffff':
Support Panorama preview.

commit | commitdiff | tree

Angus Kong [Thu, 17 May 2012 18:50:38 +0000 (11:50 -0700)]

Revert "Support Panorama preview."

This reverts commit 41832d9f1568c7d8227fb9ffebaf7830345cffff

commit | commitdiff | tree

Angus Kong [Thu, 17 May 2012 02:15:56 +0000 (19:15 -0700)]

Support Panorama preview.

The panorama preview doesn't consider display rotation.

bug:6305152
Change-Id: I6b87c18ed8eadf1b2bf5e64437c5b290d111cbba

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 00:52:09 +0000 (17:52 -0700)]

Set the window backgrond and remove it in onCreate().

To have better transistion when launching the app.

bug: 6494653
Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570

commit | commitdiff | tree

Ray Chen [Thu, 17 May 2012 16:35:00 +0000 (09:35 -0700)]

am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev

* commit 'b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6':
Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053

commit | commitdiff | tree

Ray Chen [Thu, 17 May 2012 16:32:56 +0000 (09:32 -0700)]

Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev

commit | commitdiff | tree

Ray Chen [Thu, 17 May 2012 16:19:15 +0000 (09:19 -0700)]

am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev

* commit '93ccc28d149fc8f92929e53c7d1ce1ef6c3c8dee':
Fix 6479216 Playing a video should go full-screen first

commit | commitdiff | tree

Ray Chen [Thu, 17 May 2012 16:17:40 +0000 (09:17 -0700)]

Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev

commit | commitdiff | tree

Yuli Huang [Thu, 17 May 2012 14:59:54 +0000 (07:59 -0700)]

am 5338d195: Smooth opening animation by modifying interpolation curve.

* commit '5338d1959406e95a580858e418794e23e05c47e2':
Smooth opening animation by modifying interpolation curve.

commit | commitdiff | tree

Ray Chen [Thu, 17 May 2012 08:37:13 +0000 (16:37 +0800)]

Fix 6213053 Add Help entry point to Gallery (targeted for J release)
b: 6213053

Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad

commit | commitdiff | tree

Yuli Huang [Thu, 17 May 2012 03:32:15 +0000 (11:32 +0800)]

Smooth opening animation by modifying interpolation curve.

bug:5367032
Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0

commit | commitdiff | tree

Yuli Huang [Thu, 17 May 2012 02:27:28 +0000 (19:27 -0700)]

am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev

* commit 'bcfa1b79930e567c6a52235445c759d37041ed0c':
Fix card effect shown in opening animation.

commit | commitdiff | tree

Yuli Huang [Thu, 17 May 2012 02:25:16 +0000 (19:25 -0700)]

Merge "Fix card effect shown in opening animation." into jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Thu, 17 May 2012 01:52:01 +0000 (18:52 -0700)]

am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev

* commit 'ff6687e68791b86eeda54194b6bcddffb69651da':
Handle layout change between pausing and resuming.

commit | commitdiff | tree

Chih-Chung Chang [Thu, 17 May 2012 01:49:33 +0000 (18:49 -0700)]

Merge "Handle layout change between pausing and resuming." into jb-dev

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 01:31:34 +0000 (18:31 -0700)]

am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev

* commit 'cb1a39a26ae491185f92cf33fea0205331f8447f':
Remove the black layer in MovieActivity.

commit | commitdiff | tree

Owen Lin [Thu, 17 May 2012 01:28:49 +0000 (18:28 -0700)]

Merge "Remove the black layer in MovieActivity." into jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Thu, 17 May 2012 00:37:10 +0000 (17:37 -0700)]

Handle layout change between pausing and resuming.

Bug: 6468414
Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 20:52:02 +0000 (13:52 -0700)]

Remove the black layer in MovieActivity.

bug:6491674
Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 20:45:15 +0000 (13:45 -0700)]

am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev

* commit '46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac':
Fix a dead lock while we freeze the screen.

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 20:40:25 +0000 (13:40 -0700)]

Merge "Fix a dead lock while we freeze the screen." into jb-dev

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 17:54:14 +0000 (10:54 -0700)]

Fix a dead lock while we freeze the screen.

bug: 6504696
Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 20:26:36 +0000 (13:26 -0700)]

am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev

* commit '20d98161df7427042a69ef38014219ac87a53e36':
Hide the share button if the shared URI is not "content:".

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 20:24:06 +0000 (13:24 -0700)]

Merge "Hide the share button if the shared URI is not "content:"." into jb-dev

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 18:33:57 +0000 (11:33 -0700)]

am e832a0ec: am bc8d5327: Restore deleted string still referenced from menu resource.

* commit 'e832a0ec023aa22996bd9e488e2a407b84cbe2b9':
Restore deleted string still referenced from menu resource.

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 18:31:38 +0000 (11:31 -0700)]

am bc8d5327: Restore deleted string still referenced from menu resource.

* commit 'bc8d532738a130474969b7bb158848acd9645bf1':
Restore deleted string still referenced from menu resource.

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]

Restore deleted string still referenced from menu resource.

Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 17:50:20 +0000 (10:50 -0700)]

am 80a45af0: (-s ours) am a30d822e: Import translations. DO NOT MERGE

* commit '80a45af063396d4770082b542c29738781f4fbc0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 17:48:18 +0000 (10:48 -0700)]

am a30d822e: Import translations. DO NOT MERGE

* commit 'a30d822e6034b3182eca341b4e76f5ecaf484e7a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 17:41:21 +0000 (10:41 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7ce56d9778b2e489bc152e60d5ea9b526701de76

commit | commitdiff | tree

Eric Fischer [Wed, 16 May 2012 17:41:05 +0000 (10:41 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6

commit | commitdiff | tree

Owen Lin [Tue, 15 May 2012 23:56:59 +0000 (16:56 -0700)]

Hide the share button if the shared URI is not "content:".

bug:6494818
Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647

commit | commitdiff | tree

The Android Open Source Project [Wed, 16 May 2012 15:45:46 +0000 (08:45 -0700)]

am ecee3d35: Reconcile with jb-release nakasi-factoryrom-release

* commit 'ecee3d356546957d897983827d6388fb0a94aed0':
  Fix black screen when viewing Gmail image file attachment. Bug: 6415848
  Fix crash when select all is pressed.
  Fix ANR in PhotoPage.
  Fix SinglePhotoDataAdapter getScreenNail()
  bug #6176711: guard against null GalleryActionBar.

commit | commitdiff | tree

The Android Open Source Project [Wed, 16 May 2012 15:41:02 +0000 (08:41 -0700)]

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf

commit | commitdiff | tree

The Android Automerger [Wed, 16 May 2012 14:46:15 +0000 (07:46 -0700)]

merge in nakasi-factoryrom-release history after reset to jb-dev

commit | commitdiff | tree

The Android Automerger [Wed, 16 May 2012 14:04:50 +0000 (07:04 -0700)]

merge in jb-release history after reset to jb-dev

commit | commitdiff | tree

Yuli Huang [Tue, 15 May 2012 17:38:06 +0000 (01:38 +0800)]

Fix card effect shown in opening animation.

bug:6495753
Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d

commit | commitdiff | tree

Yuli Huang [Wed, 16 May 2012 05:23:09 +0000 (22:23 -0700)]

am 252f5e76: am bd7c016d: Avoid black screen when PhotoPage just starts.

* commit '252f5e767194a26323ac9f2a5c6ae6d60f2a7ece':
Avoid black screen when PhotoPage just starts.

commit | commitdiff | tree

Yuli Huang [Wed, 16 May 2012 05:21:00 +0000 (22:21 -0700)]

am bd7c016d: Avoid black screen when PhotoPage just starts.

* commit 'bd7c016d728853d38f98a3c6077b7bd9b08858b9':
Avoid black screen when PhotoPage just starts.

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 03:32:51 +0000 (20:32 -0700)]

am 7b2e7f01: am f284d8f4: Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev

* commit '7b2e7f0199b091beceed87e61be03d681529a1a7':
Fix 6470803 De-jank for video playback in fullscreen

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 03:32:50 +0000 (20:32 -0700)]

am 88cdee47: am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev

* commit '88cdee4713e0b338b076dc4e7e36256a9a46fdbd':
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 03:29:54 +0000 (20:29 -0700)]

am f284d8f4: Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev

* commit 'f284d8f41ffa15cb7bf0167013700ed21f451fab':
Fix 6470803 De-jank for video playback in fullscreen

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 03:29:53 +0000 (20:29 -0700)]

am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev

* commit '3349078ecd14bb462756c5c1a3a3b594d5b97cb9':
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

commit | commitdiff | tree

Yuli Huang [Tue, 15 May 2012 14:36:59 +0000 (22:36 +0800)]

Avoid black screen when PhotoPage just starts.

bug:5367032

Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 01:23:46 +0000 (18:23 -0700)]

Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev

commit | commitdiff | tree

Ray Chen [Wed, 16 May 2012 01:22:13 +0000 (18:22 -0700)]

Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev

commit | commitdiff | tree

Ray Chen [Tue, 15 May 2012 03:22:21 +0000 (11:22 +0800)]

Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

Per request, change the confirm dialog message to "Delete the selected item(s)?"

b: 6046544

Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 00:46:12 +0000 (17:46 -0700)]

am 787d57a7: am 65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev

* commit '787d57a7ed44cde0a74bccca013b5b8f323748dd':
Add animation for the paddings in SlotView.

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 00:42:21 +0000 (17:42 -0700)]

am 65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev

* commit '65ebe2f71fea25ef8a770fbc08af8cc29d80c20d':
Add animation for the paddings in SlotView.

commit | commitdiff | tree

Owen Lin [Wed, 16 May 2012 00:38:52 +0000 (17:38 -0700)]

Merge "Add animation for the paddings in SlotView." into jb-dev

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 22:37:36 +0000 (15:37 -0700)]

am 59d2a10f: (-s ours) am 66e52983: Import translations. DO NOT MERGE

* commit '59d2a10fbe082fbeb82573af08fc6445dfd90469':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 22:33:27 +0000 (15:33 -0700)]

am 66e52983: Import translations. DO NOT MERGE

* commit '66e5298344f12aeb1a652f8731609f7959e15385':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 22:29:36 +0000 (15:29 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie14d3f0aef0ada917b7de6b4176d442565ae9b3a

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 22:29:21 +0000 (15:29 -0700)]

Import translations. DO NOT MERGE

Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96

commit | commitdiff | tree

The Android Automerger [Tue, 15 May 2012 16:35:45 +0000 (09:35 -0700)]

merge in nakasi-factoryrom-release history after reset to jb-dev

commit | commitdiff | tree

The Android Automerger [Tue, 15 May 2012 14:05:34 +0000 (07:05 -0700)]

merge in jb-release history after reset to jb-dev

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 02:41:23 +0000 (19:41 -0700)]

am 5cd229b3: (-s ours) am 00af9fc9: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Tue, 15 May 2012 02:33:26 +0000 (19:33 -0700)]

am 00af9fc9: Import translations. DO NOT MERGE

* commit '00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 14 May 2012 18:24:44 +0000 (11:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0a3057ba775776b9148af3e9ab7fd302f21cb8c0

commit | commitdiff | tree

Eric Fischer [Mon, 14 May 2012 18:24:28 +0000 (11:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a

commit | commitdiff | tree

Owen Lin [Wed, 9 May 2012 03:32:32 +0000 (11:32 +0800)]

Add animation for the paddings in SlotView.

bug:6383118
Change-Id: I034be207f73b027de448cef562a534f986d0cbe1

commit | commitdiff | tree

The Android Automerger [Mon, 14 May 2012 14:04:52 +0000 (07:04 -0700)]

merge in jb-release history after reset to jb-dev

commit | commitdiff | tree

Ray Chen [Mon, 14 May 2012 09:19:56 +0000 (17:19 +0800)]

Fix 6479216 Playing a video should go full-screen first

Change-Id: I7b1d2bd28531ec4fd4b65862122cf058ef69066e
b: 6479216

commit | commitdiff | tree

Ray Chen [Fri, 11 May 2012 13:50:28 +0000 (21:50 +0800)]

Fix 6470803 De-jank for video playback in fullscreen

b: 6470803

Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820

commit | commitdiff | tree

Wu-cheng Li [Fri, 11 May 2012 12:44:31 +0000 (05:44 -0700)]

am 697069a9: am 666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev

* commit '697069a9bed362fff120b28d5e87b3345b0e370a':
Remove behind screenOrientation from camera activities.

commit | commitdiff | tree

Wu-cheng Li [Fri, 11 May 2012 12:42:24 +0000 (05:42 -0700)]

am 666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev

* commit '666f6f11e8019bb3ebc84010cf74a85e9e2019ca':
Remove behind screenOrientation from camera activities.

commit | commitdiff | tree

Wu-cheng Li [Fri, 11 May 2012 12:41:04 +0000 (05:41 -0700)]

Merge "Remove behind screenOrientation from camera activities." into jb-dev

commit | commitdiff | tree

Wu-cheng Li [Fri, 11 May 2012 12:25:22 +0000 (20:25 +0800)]

Remove behind screenOrientation from camera activities.

Camera has both landscape and portrait layouts. Screen orientation
will be set in onCreate. "behind" is not needed anymore.

bug:6480864

Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de

commit | commitdiff | tree

Chih-Chung Chang [Fri, 11 May 2012 10:38:27 +0000 (03:38 -0700)]

am 218c3de8: am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev

* commit '218c3de8e1cf515752fe2fa4700c34267fc38eb5':
Better data change handling for PhotoDataAdapter and PhotoView.

commit | commitdiff | tree

Chih-Chung Chang [Fri, 11 May 2012 10:34:49 +0000 (03:34 -0700)]

am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev

* commit '6033e0754ee1e1270cef74e12e40a4f9f2408e91':
Better data change handling for PhotoDataAdapter and PhotoView.

commit | commitdiff | tree

Chih-Chung Chang [Fri, 11 May 2012 10:31:10 +0000 (03:31 -0700)]

Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Fri, 11 May 2012 09:20:53 +0000 (17:20 +0800)]

Better data change handling for PhotoDataAdapter and PhotoView.

Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e

commit | commitdiff | tree

Owen Lin [Fri, 11 May 2012 06:17:54 +0000 (23:17 -0700)]

am 35f941db: am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev

* commit '35f941db269314bc8c866e1ced2de17fd7686c03':
Make sure we won't upload recycled bitmap.

commit | commitdiff | tree

Owen Lin [Fri, 11 May 2012 06:15:49 +0000 (23:15 -0700)]

am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev

* commit 'da438c77120c0ec5a626f78c5dc48dc1c2b0ea26':
Make sure we won't upload recycled bitmap.

commit | commitdiff | tree

Owen Lin [Fri, 11 May 2012 04:17:31 +0000 (21:17 -0700)]

Merge "Make sure we won't upload recycled bitmap." into jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 18:56:11 +0000 (11:56 -0700)]

am dc65d3ac: am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev

* commit 'dc65d3acb83600b2d9b1f553152ef0701e1eda46':
Add freeze/unfreeze for GLRootView.

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 18:56:09 +0000 (11:56 -0700)]

am c421de27: am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev

* commit 'c421de27ddd1330732e5f3ceddd4136cb1e27520':
Handle ScreenNail size change.

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 16:26:28 +0000 (09:26 -0700)]

am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev

* commit 'd2e409d1dd54160483edac3a420f59bc5d83fcc6':
Add freeze/unfreeze for GLRootView.

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 16:26:07 +0000 (09:26 -0700)]

am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev

* commit '91c1435ea3a25a7c0e071ecf378ed58690b8a650':
Handle ScreenNail size change.

commit | commitdiff | tree

The Android Automerger [Thu, 10 May 2012 14:04:47 +0000 (07:04 -0700)]

merge in jb-release history after reset to jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 08:46:43 +0000 (01:46 -0700)]

Merge "Add freeze/unfreeze for GLRootView." into jb-dev

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 03:03:35 +0000 (11:03 +0800)]

Add freeze/unfreeze for GLRootView.

Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f

commit | commitdiff | tree

Chih-Chung Chang [Thu, 10 May 2012 03:24:21 +0000 (20:24 -0700)]