OSDN Git Service
Doris Liu [Fri, 4 Oct 2013 04:27:23 +0000 (21:27 -0700)]
am
309cd179: am
b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
* commit '
309cd179b821f63b25e5ebae556b38daabab1708':
Prevent picture taking via volumn key in filmstrip mode
Doris Liu [Fri, 4 Oct 2013 04:24:36 +0000 (21:24 -0700)]
am
b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
* commit '
b0fbd5437cc67ce10e8f4b2a7318d4cc97110976':
Prevent picture taking via volumn key in filmstrip mode
Doris Liu [Fri, 4 Oct 2013 00:08:20 +0000 (00:08 +0000)]
Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
Doris Liu [Thu, 3 Oct 2013 22:31:40 +0000 (15:31 -0700)]
Prevent picture taking via volumn key in filmstrip mode
Bug:
11045068
Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
Sascha Haeberling [Thu, 3 Oct 2013 22:11:38 +0000 (15:11 -0700)]
am
7c1ae08c: am
7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
* commit '
7c1ae08c1dfcfbae45f3d4692adee6140386eebd':
Sync Camera2 permissions to GoogleCamera permissions.
Sascha Haeberling [Thu, 3 Oct 2013 22:09:39 +0000 (15:09 -0700)]
am
7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
* commit '
7ba4a88eb78fc41717275de25748f5cf17915f5b':
Sync Camera2 permissions to GoogleCamera permissions.
Sascha Haeberling [Thu, 3 Oct 2013 22:07:15 +0000 (22:07 +0000)]
Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
Erin Dahlgren [Thu, 3 Oct 2013 21:08:39 +0000 (14:08 -0700)]
am
88b31b09: am
77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
* commit '
88b31b0940459f79204086d567a8aaad0a842f89':
Make space for photosphere rendering text
Erin Dahlgren [Thu, 3 Oct 2013 21:06:32 +0000 (14:06 -0700)]
am
77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
* commit '
77dd14930b24816369560a73cfb0610c1f745d05':
Make space for photosphere rendering text
Erin Dahlgren [Thu, 3 Oct 2013 21:05:16 +0000 (21:05 +0000)]
Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 3 Oct 2013 20:56:40 +0000 (13:56 -0700)]
am
6b879500: am
238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
* commit '
6b879500209fb3f187141ece2bed39537a697aa1':
Change icons and code from HQ to HDR+ mode.
Sascha Haeberling [Thu, 3 Oct 2013 20:52:18 +0000 (13:52 -0700)]
am
238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
* commit '
238799e97077ee72a53a5a04d9d3068aebb82bf7':
Change icons and code from HQ to HDR+ mode.
Sascha Haeberling [Thu, 3 Oct 2013 20:47:44 +0000 (20:47 +0000)]
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
Angus Kong [Thu, 3 Oct 2013 20:46:33 +0000 (13:46 -0700)]
am
5f16c140: am
5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad
* commit '
5f16c14039b2c97492b03f27c45e5ea01aa0b557':
Don't allow actions on items in progress.
Angus Kong [Thu, 3 Oct 2013 20:44:02 +0000 (13:44 -0700)]
am
5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad
* commit '
5bca6f4cf43732edf459010f418d3719e07f3c8a':
Don't allow actions on items in progress.
Angus Kong [Thu, 3 Oct 2013 20:42:15 +0000 (20:42 +0000)]
Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad
Doris Liu [Thu, 3 Oct 2013 20:26:42 +0000 (13:26 -0700)]
am
67510532: am
930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
* commit '
67510532c164801a1bc995942f44e21453b3e1d4':
Leave ROI not set except in tap-to-focus scenario
Doris Liu [Thu, 3 Oct 2013 20:22:50 +0000 (13:22 -0700)]
am
930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
* commit '
930b9b41185a2f59c05fe527300248776d3993a0':
Leave ROI not set except in tap-to-focus scenario
Angus Kong [Wed, 2 Oct 2013 23:53:40 +0000 (16:53 -0700)]
Don't allow actions on items in progress.
bug:
11049529
Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
Doris Liu [Thu, 3 Oct 2013 19:38:16 +0000 (19:38 +0000)]
Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 3 Oct 2013 19:10:48 +0000 (12:10 -0700)]
Change icons and code from HQ to HDR+ mode.
Bug:
11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
Kevin Gabayan [Thu, 3 Oct 2013 19:20:15 +0000 (12:20 -0700)]
am
5ed30cb7: am
68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad
* commit '
5ed30cb77f6e73995f3acf8bb00a2a28fd8e6ed1':
Camera2 icon update for all resolutions.
Sascha Haeberling [Thu, 3 Oct 2013 19:19:58 +0000 (12:19 -0700)]
am
644c534f: am
623b74b6: Add HDR+ mode strings (to replace HQ mode)
* commit '
644c534f6b1d37a8fdd4c1d8f0e243ad13690204':
Add HDR+ mode strings (to replace HQ mode)
Sascha Haeberling [Thu, 3 Oct 2013 19:19:42 +0000 (12:19 -0700)]
am
8a605fad: am
3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad
* commit '
8a605fad65487973449f629bcf6e396f2d79ad3c':
Add missing crop message.
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.
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.
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.
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
Erin Dahlgren [Thu, 3 Oct 2013 18:49:30 +0000 (11:49 -0700)]
Make space for photosphere rendering text
Bug:
11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
Doris Liu [Thu, 3 Oct 2013 18:00:59 +0000 (11:00 -0700)]
Leave ROI not set except in tap-to-focus scenario
Bug:
11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
Kevin Gabayan [Thu, 3 Oct 2013 17:57:39 +0000 (10:57 -0700)]
am
68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad
* commit '
68fc363bd33a9e506ccfd1ffa330c4525a2734ce':
Camera2 icon update for all resolutions.
Kevin Gabayan [Thu, 3 Oct 2013 17:54:51 +0000 (17:54 +0000)]
Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 3 Oct 2013 17:26:08 +0000 (10:26 -0700)]
am
623b74b6: Add HDR+ mode strings (to replace HQ mode)
* commit '
623b74b608fae83034bab58331fc705b8cfecaa6':
Add HDR+ mode strings (to replace HQ mode)
Sascha Haeberling [Thu, 3 Oct 2013 06:00:46 +0000 (23:00 -0700)]
Add HDR+ mode strings (to replace HQ mode)
Bug:
11047147
Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
Sascha Haeberling [Thu, 3 Oct 2013 16:51:40 +0000 (09:51 -0700)]
am
3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad
* commit '
3393a62797fa397823eba720b3f52d39ae065739':
Add missing crop message.
Sascha Haeberling [Thu, 3 Oct 2013 16:49:56 +0000 (16:49 +0000)]
Merge "Add missing crop message." into gb-ub-photos-carlsbad
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.
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.
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
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
Sascha Haeberling [Thu, 3 Oct 2013 07:01:12 +0000 (00:01 -0700)]
Add missing crop message.
Bug:
11021907
Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
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.
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
Baligh Uddin [Thu, 3 Oct 2013 04:03:00 +0000 (04:03 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Kevin Gabayan [Thu, 3 Oct 2013 01:25:05 +0000 (18:25 -0700)]
Camera2 icon update for all resolutions.
Bug:
11048341
Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1
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
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
Sascha Haeberling [Thu, 3 Oct 2013 00:17:29 +0000 (17:17 -0700)]
Sync Camera2 permissions to GoogleCamera permissions.
Bug:
10951073
Excluding the Gallery3d and gservices permissions.
Change-Id: If6508114a47e1a793a2b4caab81437242907f8d2
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
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.
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.
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
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
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.
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.
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.
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.
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
Angus Kong [Wed, 2 Oct 2013 20:18:25 +0000 (20:18 +0000)]
Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
Angus Kong [Tue, 1 Oct 2013 23:58:52 +0000 (16:58 -0700)]
Make scroll animation smoother.
bug:
10802703
Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
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
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
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.
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
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.
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
Sascha Haeberling [Wed, 2 Oct 2013 00:46:20 +0000 (17:46 -0700)]
Deactivate the backup agent in Camera2
Bug:
11033304
Change-Id: I9fc4d3b02b1dd041988fb9d0f313693b5ae1b865
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
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
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
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
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
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
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
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
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
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
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.
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.
Angus Kong [Tue, 1 Oct 2013 18:32:52 +0000 (11:32 -0700)]
Prevent NPE in gesture handling.
bug:
11023769
Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
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
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
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
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.
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.
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
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
Baligh Uddin [Tue, 1 Oct 2013 04:34:15 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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.
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
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
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
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
ztenghui [Tue, 1 Oct 2013 00:20:12 +0000 (17:20 -0700)]
am
4feabff8: Fix MediaStore correction code.
* commit '
4feabff8b87e1b71e8040dbcd6289a313bf9f593':
Fix MediaStore correction code.
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.
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
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
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
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
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
OSDN Git Service
