OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure...
ztenghui [Thu, 3 Oct 2013 22:41:04 +0000 (15:41 -0700)]
am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '27408847ed867399fed01515848d3cd93a4d343f':
  Only show delete action when in secure camera mode.

10 years agoam d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is...
ztenghui [Thu, 3 Oct 2013 22:40:59 +0000 (15:40 -0700)]
am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit 'd915fa042edd436dd819ac889f523da452bf37ae':
  Show the delete button if there is room in action bar.

10 years agoam ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALL...
Mangesh Ghiware [Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)]
am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit 'ac63f9c493d6b755a5bfc106d603ce850b2443de':
  Exit Camera on Up button if no APP_GALLERY handler found.

10 years agoam b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)]
am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode...
ztenghui [Thu, 3 Oct 2013 19:19:32 +0000 (12:19 -0700)]
am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '9a09d511ce26df0bb81a3fc3b61d68356c790860':
  Only show delete action when in secure camera mode.

10 years agoam cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action...
ztenghui [Thu, 3 Oct 2013 19:19:31 +0000 (12:19 -0700)]
am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit 'cd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2':
  Show the delete button if there is room in action bar.

10 years agoam 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler...
Mangesh Ghiware [Thu, 3 Oct 2013 19:19:20 +0000 (12:19 -0700)]
am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit '893981de1e8359f15ade64ce81f5d8efc35581eb':
  Exit Camera on Up button if no APP_GALLERY handler found.

10 years agoam 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 3 Oct 2013 19:19:12 +0000 (12:19 -0700)]
am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8bab49cd8647480316598d5e510bf073166795d0':
  Import translations. DO NOT MERGE

10 years agoam 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb...
ztenghui [Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)]
am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd':
  Only show delete action when in secure camera mode.

10 years agoam 9ac97492: Merge "Show the delete button if there is room in action bar." into...
ztenghui [Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)]
am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit '9ac97492cafafc02357de21074d95b29d55d2e9f':
  Show the delete button if there is room in action bar.

10 years agoMerge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
ztenghui [Thu, 3 Oct 2013 16:02:44 +0000 (16:02 +0000)]
Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

10 years agoMerge "Show the delete button if there is room in action bar." into gb-ub-photos...
ztenghui [Thu, 3 Oct 2013 16:02:32 +0000 (16:02 +0000)]
Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

10 years agoam 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into...
Mangesh Ghiware [Thu, 3 Oct 2013 04:18:11 +0000 (21:18 -0700)]
am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit '4f563f1d91b381ff840e84c52d548194517f6b4c':
  Exit Camera on Up button if no APP_GALLERY handler found.

10 years agoMerge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos...
Mangesh Ghiware [Thu, 3 Oct 2013 04:15:47 +0000 (04:15 +0000)]
Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 3 Oct 2013 04:03:00 +0000 (04:03 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoOnly show delete action when in secure camera mode.
ztenghui [Thu, 3 Oct 2013 00:31:47 +0000 (17:31 -0700)]
Only show delete action when in secure camera mode.

bug:11048260
Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 3 Oct 2013 00:29:37 +0000 (17:29 -0700)]
Import translations. DO NOT MERGE

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

10 years agoShow the delete button if there is room in action bar.
ztenghui [Wed, 2 Oct 2013 20:31:35 +0000 (13:31 -0700)]
Show the delete button if there is room in action bar.

bug:10731828

Change-Id: I251593bcbfc8547d1bc445a56f3cd7fd3dd4acf3

10 years agoam 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer...
Sascha Haeberling [Wed, 2 Oct 2013 22:55:20 +0000 (15:55 -0700)]
am 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit '81fa362246bed290463f94fdba71a989d796ef94':
  Increase char limit for camera timer sound message.

10 years agoam f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message...
Sascha Haeberling [Wed, 2 Oct 2013 22:53:48 +0000 (15:53 -0700)]
am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit 'f8b53c38e933bf9290f727fbf6532839e917fee4':
  Increase char limit for camera timer sound message.

10 years agoam c60e2b09: Merge "Increase char limit for camera timer sound message." into gb...
Sascha Haeberling [Wed, 2 Oct 2013 22:52:01 +0000 (15:52 -0700)]
am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3':
  Increase char limit for camera timer sound message.

10 years agoMerge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 22:49:21 +0000 (22:49 +0000)]
Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

10 years agoExit Camera on Up button if no APP_GALLERY handler found.
Mangesh Ghiware [Wed, 2 Oct 2013 21:38:12 +0000 (14:38 -0700)]
Exit Camera on Up button if no APP_GALLERY handler found.

Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c

10 years agoam 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully...
Erin Dahlgren [Wed, 2 Oct 2013 21:37:04 +0000 (14:37 -0700)]
am 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit '826b06319f634332c56873db602d80aa14c7bab9':
  Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

10 years agoam 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into...
Angus Kong [Wed, 2 Oct 2013 21:37:04 +0000 (14:37 -0700)]
am 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '81f859dfe54b5884b9641726f463ddc5dac5424e':
  Make scroll animation smoother.

10 years agoam 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so...
Erin Dahlgren [Wed, 2 Oct 2013 21:34:36 +0000 (14:34 -0700)]
am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit '03b10508d51f03695d91268826a4044f24929340':
  Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

10 years agoam 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos...
Angus Kong [Wed, 2 Oct 2013 21:34:36 +0000 (14:34 -0700)]
am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '632afc196121cb15a53b4cffd3b93df4fcd39f46':
  Make scroll animation smoother.

10 years agoam cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere...
Erin Dahlgren [Wed, 2 Oct 2013 21:28:24 +0000 (14:28 -0700)]
am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit 'cf7babd5cbe69cf99d96e46c306d6733837f48eb':
  Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

10 years agoam 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
Angus Kong [Wed, 2 Oct 2013 21:28:24 +0000 (14:28 -0700)]
am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '45f5976f2c1d4eda46be4ea591c6196c683f2ded':
  Make scroll animation smoother.

10 years agoMerge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon...
Erin Dahlgren [Wed, 2 Oct 2013 20:36:06 +0000 (20:36 +0000)]
Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

10 years agoMerge "Make scroll animation smoother." into gb-ub-photos-carlsbad
Angus Kong [Wed, 2 Oct 2013 20:18:25 +0000 (20:18 +0000)]
Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

10 years agoam 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2...
Sascha Haeberling [Wed, 2 Oct 2013 16:37:04 +0000 (09:37 -0700)]
am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '3c45c0c0b250eecd2a589a3616a14dea195564a8':
  Deactivate the backup agent in Camera2

10 years agoam 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture...
Sascha Haeberling [Wed, 2 Oct 2013 16:37:03 +0000 (09:37 -0700)]
am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

* commit '5a55e6b8a63e6f5a287ccc7c3099423e5e5fa30b':
  Add content description to post-capture thumbnail.

10 years agoam b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if...
Erin Dahlgren [Wed, 2 Oct 2013 16:36:46 +0000 (09:36 -0700)]
am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit 'b763357340619b188d0d536e31c5e7ddbcfec595':
  Fix FilmStrip crash by checking if photos are present before updating action bar

10 years agoam c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view
Doris Liu [Wed, 2 Oct 2013 16:36:43 +0000 (09:36 -0700)]
am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view

* commit 'c4810a331b4420a18e8925afd61b0a0006943704':
  A workaround for crash in zoom view

10 years agoam ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling.
Angus Kong [Wed, 2 Oct 2013 16:35:37 +0000 (09:35 -0700)]
am ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling.

* commit 'ee7f3963c8fcb44ff8d1d1864ac480664f3f645c':
  Prevent NPE in gesture handling.

10 years agoam 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstri...
Doris Liu [Wed, 2 Oct 2013 16:35:19 +0000 (09:35 -0700)]
am 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

* commit '6f2be56cad8a8963f351eb8d21996a9c222a6f60':
  Double tap to full screen from filmstrip

10 years agoam ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmSt...
Erin Dahlgren [Wed, 2 Oct 2013 16:35:08 +0000 (09:35 -0700)]
am ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

* commit 'ee8d0e11a987bb5b12f0b760a918913c7a1661d0':
  Updates newly centered photos in FilmStrip after a delete.

10 years agoam bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 2 Oct 2013 16:34:42 +0000 (09:34 -0700)]
am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into...
Angus Kong [Wed, 2 Oct 2013 16:34:40 +0000 (09:34 -0700)]
am 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad

* commit '85be0ac807789a8d02ab900de179adbef5c865cb':
  Don't adjust the position while scrolling.

10 years agoam 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos...
Sascha Haeberling [Wed, 2 Oct 2013 16:34:40 +0000 (09:34 -0700)]
am 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

* commit '7334597fcc93679d49d15e3922887496b17cb3cd':
  Show status bar in filmstrip mode

10 years agoMake scroll animation smoother.
Angus Kong [Tue, 1 Oct 2013 23:58:52 +0000 (16:58 -0700)]
Make scroll animation smoother.

  bug:10802703

Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4

10 years agoam 293cf7e4: am 4feabff8: Fix MediaStore correction code.
ztenghui [Wed, 2 Oct 2013 05:21:40 +0000 (22:21 -0700)]
am 293cf7e4: am 4feabff8: Fix MediaStore correction code.

* commit '293cf7e4030fc029911386b4da9f1805aafa8ba5':
  Fix MediaStore correction code.

10 years agoam 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing.
Sascha Haeberling [Wed, 2 Oct 2013 05:21:40 +0000 (22:21 -0700)]
am 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing.

* commit '9c9244fceb36344594946360c8b00cf62539f19f':
  Change crop label to avoid aapt dump badging from failing.

10 years agoam b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb...
Sascha Haeberling [Wed, 2 Oct 2013 01:16:41 +0000 (18:16 -0700)]
am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit 'b8968f2ce791c437322c25ef6e6fdc9d0fa10d65':
  Deactivate the backup agent in Camera2

10 years agoam 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 01:14:28 +0000 (18:14 -0700)]
am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '706c985f0a8c8d996b979543a541ed2cb41269e1':
  Deactivate the backup agent in Camera2

10 years agoam 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail...
Sascha Haeberling [Wed, 2 Oct 2013 01:13:06 +0000 (18:13 -0700)]
am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

* commit '607bb9a208578dc7e0aa79c4dd222e3edd26566b':
  Add content description to post-capture thumbnail.

10 years agoMerge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 01:11:41 +0000 (01:11 +0000)]
Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

10 years agoam 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub...
Sascha Haeberling [Wed, 2 Oct 2013 01:11:19 +0000 (18:11 -0700)]
am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

* commit '72a83bc295dfa5c0d07102065f50930bf18e28e2':
  Add content description to post-capture thumbnail.

10 years agoMerge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 01:09:30 +0000 (01:09 +0000)]
Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

10 years agoDeactivate the backup agent in Camera2
Sascha Haeberling [Wed, 2 Oct 2013 00:46:20 +0000 (17:46 -0700)]
Deactivate the backup agent in Camera2

  Bug: 11033304

Change-Id: I9fc4d3b02b1dd041988fb9d0f313693b5ae1b865

10 years agoIncrease char limit for camera timer sound message.
Sascha Haeberling [Tue, 1 Oct 2013 23:58:08 +0000 (16:58 -0700)]
Increase char limit for camera timer sound message.

  Bug: 10962439

Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e

10 years agoAdd content description to post-capture thumbnail.
Sascha Haeberling [Tue, 1 Oct 2013 23:42:47 +0000 (16:42 -0700)]
Add content description to post-capture thumbnail.

  Bug: 10916138

Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652

10 years agoam 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are presen...
Erin Dahlgren [Tue, 1 Oct 2013 23:41:14 +0000 (16:41 -0700)]
am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit '852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e':
  Fix FilmStrip crash by checking if photos are present before updating action bar

10 years agoam 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before...
Erin Dahlgren [Tue, 1 Oct 2013 23:36:51 +0000 (16:36 -0700)]
am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit '6416ba8a428025c669782a2d3226f06ad5a86921':
  Fix FilmStrip crash by checking if photos are present before updating action bar

10 years agoMerge "Fix FilmStrip crash by checking if photos are present before updating action...
Erin Dahlgren [Tue, 1 Oct 2013 23:35:12 +0000 (23:35 +0000)]
Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

10 years agoam 148b65b0: am 1f69e36b: A workaround for crash in zoom view
Doris Liu [Tue, 1 Oct 2013 23:14:45 +0000 (16:14 -0700)]
am 148b65b0: am 1f69e36b: A workaround for crash in zoom view

* commit '148b65b0c1ac7f202af2e682a21cac298c7d05ef':
  A workaround for crash in zoom view

10 years agoam 1f69e36b: A workaround for crash in zoom view
Doris Liu [Tue, 1 Oct 2013 23:12:33 +0000 (16:12 -0700)]
am 1f69e36b: A workaround for crash in zoom view

* commit '1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf':
  A workaround for crash in zoom view

10 years agoReads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
Erin Dahlgren [Tue, 1 Oct 2013 18:00:12 +0000 (11:00 -0700)]
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

Bug: 10715651
Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6

10 years agoA workaround for crash in zoom view
Doris Liu [Tue, 1 Oct 2013 22:04:09 +0000 (15:04 -0700)]
A workaround for crash in zoom view

Bug: 10636636
Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e

10 years agoFix FilmStrip crash by checking if photos are present before updating action bar
Erin Dahlgren [Tue, 1 Oct 2013 20:42:51 +0000 (13:42 -0700)]
Fix FilmStrip crash by checking if photos are present before updating action bar

Bug: 11027838
Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a

10 years agoam 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling.
Angus Kong [Tue, 1 Oct 2013 19:38:54 +0000 (12:38 -0700)]
am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling.

* commit '9baebd5de51909a5c06c5c8c35201c6e251eec95':
  Prevent NPE in gesture handling.

10 years agoam 7fc104e4: Prevent NPE in gesture handling.
Angus Kong [Tue, 1 Oct 2013 19:37:11 +0000 (12:37 -0700)]
am 7fc104e4: Prevent NPE in gesture handling.

* commit '7fc104e4e75ac881269fd4a093513da01565e5d6':
  Prevent NPE in gesture handling.

10 years agoPrevent NPE in gesture handling.
Angus Kong [Tue, 1 Oct 2013 18:32:52 +0000 (11:32 -0700)]
Prevent NPE in gesture handling.

  bug:11023769

Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7

10 years agoam 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb...
Doris Liu [Tue, 1 Oct 2013 17:49:05 +0000 (10:49 -0700)]
am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

* commit '5eb88117627c555398f04065e79bb601337b12f7':
  Double tap to full screen from filmstrip

10 years agoam e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
Doris Liu [Tue, 1 Oct 2013 17:46:18 +0000 (10:46 -0700)]
am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

* commit 'e2d59dcccf177fdd158949a6b2f741a75d504416':
  Double tap to full screen from filmstrip

10 years agoMerge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
Doris Liu [Tue, 1 Oct 2013 17:44:14 +0000 (17:44 +0000)]
Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

10 years agoam ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after...
Erin Dahlgren [Tue, 1 Oct 2013 17:05:50 +0000 (10:05 -0700)]
am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

* commit 'ed3a34fb4bdb77ee3bca61398d57a32c01b0523f':
  Updates newly centered photos in FilmStrip after a delete.

10 years agoam ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into...
Erin Dahlgren [Tue, 1 Oct 2013 17:02:05 +0000 (10:02 -0700)]
am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

* commit 'ad3003bbb275b91d7564568e413400fc187dbcd4':
  Updates newly centered photos in FilmStrip after a delete.

10 years agoMerge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos...
Erin Dahlgren [Tue, 1 Oct 2013 15:49:59 +0000 (15:49 +0000)]
Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

10 years agoam f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug
Alan Newberger [Tue, 1 Oct 2013 12:23:13 +0000 (05:23 -0700)]
am f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug

* commit 'f390ec0c09bbd043466a5b22c9bef70426c3c07b':
  Temporary removal of resize code to evaluate GCam image bug

10 years agoam 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 1 Oct 2013 04:37:30 +0000 (21:37 -0700)]
am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1637661648894b78f997a44cce6d0e49155bf340':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 1 Oct 2013 04:34:15 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos...
Angus Kong [Tue, 1 Oct 2013 04:04:57 +0000 (21:04 -0700)]
am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad

* commit 'a1cb57beb56e17f8d64b82cb1465dcb63cce74b1':
  Don't adjust the position while scrolling.

10 years agoMerge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
Angus Kong [Tue, 1 Oct 2013 04:03:53 +0000 (04:03 +0000)]
Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad

10 years agoam 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 1 Oct 2013 03:51:49 +0000 (20:51 -0700)]
am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

* commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427':
  Show status bar in filmstrip mode

10 years agoMerge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 1 Oct 2013 02:36:39 +0000 (02:36 +0000)]
Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

10 years agoUpdates newly centered photos in FilmStrip after a delete.
Erin Dahlgren [Mon, 30 Sep 2013 21:14:44 +0000 (14:14 -0700)]
Updates newly centered photos in FilmStrip after a delete.

Bug: 10715651

Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a

10 years agoam 4feabff8: Fix MediaStore correction code.
ztenghui [Tue, 1 Oct 2013 00:20:12 +0000 (17:20 -0700)]
am 4feabff8: Fix MediaStore correction code.

* commit '4feabff8b87e1b71e8040dbcd6289a313bf9f593':
  Fix MediaStore correction code.

10 years agoam c4aa7c0e: Change crop label to avoid aapt dump badging from failing.
Sascha Haeberling [Tue, 1 Oct 2013 00:20:11 +0000 (17:20 -0700)]
am c4aa7c0e: Change crop label to avoid aapt dump badging from failing.

* commit 'c4aa7c0e3c9b6a15eca03ba7bdaaccf3ceb8c15d':
  Change crop label to avoid aapt dump badging from failing.

10 years agoam 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate...
Sascha Haeberling [Tue, 1 Oct 2013 00:09:44 +0000 (17:09 -0700)]
am 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad

* commit '70d6ff76b6e967fccbaf66256331e076366d6ae0':
  Add basic EXIF to the tiny planet so that rotate succeeds.

10 years agoam d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore.
ztenghui [Tue, 1 Oct 2013 00:09:43 +0000 (17:09 -0700)]
am d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore.

* commit 'd200ce9a514895d021129e5f534cac0cf5bdfcf8':
  Fix incorrect width and height from MediaStore.

10 years agoam 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub...
Angus Kong [Tue, 1 Oct 2013 00:08:27 +0000 (17:08 -0700)]
am 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad

* commit '5475e8016e33164756b80152ae3a0c8f48397c67':
  Restore HQ preference in GCam module.

10 years agoam 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after...
ztenghui [Tue, 1 Oct 2013 00:08:24 +0000 (17:08 -0700)]
am 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after rotation

* commit '2b0ce26b317abd5dfad18bc5a916cb81cf01a195':
  Don't update the width and height in MediaStore after rotation

10 years agoam 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog...
Sascha Haeberling [Tue, 1 Oct 2013 00:06:52 +0000 (17:06 -0700)]
am 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad

* commit '2062cfd46e029e95ff4b7c22282ffa34fac1706c':
  Add orientation information to the details dialog.

10 years agoam 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver
Doris Liu [Tue, 1 Oct 2013 00:06:33 +0000 (17:06 -0700)]
am 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver

* commit '2b72f33bebf07b628a3c0bc65c147b4c447c427a':
  Fix memory leak of context in LocalMediaObserver

10 years agoShow status bar in filmstrip mode
Sascha Haeberling [Mon, 30 Sep 2013 22:52:28 +0000 (15:52 -0700)]
Show status bar in filmstrip mode

  Bug: 11005642

Also makes sure we only call setSystemUiVisibility in only one
place.

Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa

10 years agoFix MediaStore correction code.
ztenghui [Mon, 30 Sep 2013 19:19:31 +0000 (12:19 -0700)]
Fix MediaStore correction code.

This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085.

And this CL make sure we handle rotated image correctly and update the
MediaStore according to the bitmap size.

bug:10988273
Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc

10 years agoDon't adjust the position while scrolling.
Angus Kong [Mon, 30 Sep 2013 22:54:46 +0000 (15:54 -0700)]
Don't adjust the position while scrolling.

  bug:10802703

Change-Id: I493c36b87c99de97275add1243f5ac363a28787e

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Sep 2013 21:45:19 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE

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

10 years agoChange crop label to avoid aapt dump badging from failing.
Sascha Haeberling [Mon, 30 Sep 2013 21:12:39 +0000 (14:12 -0700)]
Change crop label to avoid aapt dump badging from failing.

  Bug: 11006006

Change-Id: Ie6bb4cecc58f25947998f1faa4da6b3b84dc5df3

10 years agoam fb344efd: Temporary removal of resize code to evaluate GCam image bug
Alan Newberger [Sun, 29 Sep 2013 22:18:13 +0000 (15:18 -0700)]
am fb344efd: Temporary removal of resize code to evaluate GCam image bug

* commit 'fb344efde20ffab903fae7c6e5a2e1c90b4ef085':
  Temporary removal of resize code to evaluate GCam image bug

10 years agoTemporary removal of resize code to evaluate GCam image bug
Alan Newberger [Sun, 29 Sep 2013 22:02:50 +0000 (15:02 -0700)]
Temporary removal of resize code to evaluate GCam image bug

removes LocalMediaData resize code to evaluate black screenshots.

this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF.

Bug: 10988273
Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0

10 years agoam ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into...
Sascha Haeberling [Sat, 28 Sep 2013 00:06:49 +0000 (17:06 -0700)]
am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad

* commit 'ac5cb2430408f9a1854a4e22e8297733279bf75b':
  Add basic EXIF to the tiny planet so that rotate succeeds.

10 years agoam b7be228d: Fix incorrect width and height from MediaStore.
ztenghui [Sat, 28 Sep 2013 00:06:48 +0000 (17:06 -0700)]
am b7be228d: Fix incorrect width and height from MediaStore.

* commit 'b7be228d192cb8f91079caaa2f77a884a40b1160':
  Fix incorrect width and height from MediaStore.

10 years agoMerge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos...
Sascha Haeberling [Sat, 28 Sep 2013 00:05:44 +0000 (00:05 +0000)]
Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad

10 years agoFix incorrect width and height from MediaStore.
ztenghui [Fri, 20 Sep 2013 23:07:42 +0000 (16:07 -0700)]
Fix incorrect width and height from MediaStore.

bug:10768232

Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf

10 years agoAdd basic EXIF to the tiny planet so that rotate succeeds.
Sascha Haeberling [Fri, 27 Sep 2013 21:38:39 +0000 (14:38 -0700)]
Add basic EXIF to the tiny planet so that rotate succeeds.

  Bug: 10861115

Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b

10 years agoDouble tap to full screen from filmstrip
Doris Liu [Fri, 27 Sep 2013 21:12:00 +0000 (14:12 -0700)]
Double tap to full screen from filmstrip

Also fix the first photo going from full screen to filmstrip on single tap

Bug: 10948166
Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75

10 years agoam 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
Angus Kong [Fri, 27 Sep 2013 19:09:18 +0000 (12:09 -0700)]
am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad

* commit '9ba47bf4b755337786bb2bbc810ab69a5772e38f':
  Restore HQ preference in GCam module.