OSDN Git Service
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: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
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
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: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: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: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: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: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: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: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: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: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: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
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
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
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.
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.
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
ztenghui [Fri, 20 Sep 2013 23:07:42 +0000 (16:07 -0700)]
Fix incorrect width and height from MediaStore.
bug:
10768232
Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
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
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
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.
Angus Kong [Fri, 27 Sep 2013 19:06:02 +0000 (19:06 +0000)]
Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
ztenghui [Fri, 27 Sep 2013 18:24:10 +0000 (11:24 -0700)]
am
af41aaa4: Don\'t update the width and height in MediaStore after rotation
* commit '
af41aaa4005d7abcc45ea3c7fb87af098ef49ce8':
Don't update the width and height in MediaStore after rotation
ztenghui [Fri, 27 Sep 2013 17:51:02 +0000 (10:51 -0700)]
Don't update the width and height in MediaStore after rotation
bug:
10917681
Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
Angus Kong [Fri, 27 Sep 2013 18:01:36 +0000 (11:01 -0700)]
Restore HQ preference in GCam module.
bug:
10860305
Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
Sascha Haeberling [Fri, 27 Sep 2013 00:20:46 +0000 (17:20 -0700)]
am
3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
* commit '
3cde3ece3e6e384f831a02f21c677e292a824df8':
Add orientation information to the details dialog.
Sascha Haeberling [Fri, 27 Sep 2013 00:17:43 +0000 (00:17 +0000)]
Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 26 Sep 2013 23:01:23 +0000 (16:01 -0700)]
Add orientation information to the details dialog.
Bug:
10649902
Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
Doris Liu [Thu, 26 Sep 2013 23:47:15 +0000 (16:47 -0700)]
am
2b86d873: Fix memory leak of context in LocalMediaObserver
* commit '
2b86d873ca4fb3a921139633ed7be9959ab452df':
Fix memory leak of context in LocalMediaObserver
Doris Liu [Thu, 26 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Fix memory leak of context in LocalMediaObserver
Bug:
10728773
Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
Seth Raphael [Thu, 26 Sep 2013 21:07:42 +0000 (14:07 -0700)]
am
66788094: Remove PopupManager to remove a memory leak
* commit '
667880948de7a051f62359878cb61c1e0a867e24':
Remove PopupManager to remove a memory leak
Seth Raphael [Thu, 26 Sep 2013 20:51:07 +0000 (13:51 -0700)]
Remove PopupManager to remove a memory leak
PopupManager had been previously refactored out
but vestiges remained. They were causing a memory
leak of Activities in its hash map.
Bug:
10728773
Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
Sascha Haeberling [Thu, 26 Sep 2013 20:37:07 +0000 (13:37 -0700)]
am
67685a78: Add HQ icon indicator support.
* commit '
67685a78a29a0311043f38f8766a1fbbf881a599':
Add HQ icon indicator support.
Sascha Haeberling [Thu, 26 Sep 2013 20:07:41 +0000 (13:07 -0700)]
Add HQ icon indicator support.
Bug:
10785988
Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
Doris Liu [Thu, 26 Sep 2013 19:47:52 +0000 (12:47 -0700)]
am
f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
* commit '
f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2':
Finalize deletion when app exits and for last photo
Doris Liu [Thu, 26 Sep 2013 19:44:55 +0000 (19:44 +0000)]
Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
Doris Liu [Thu, 26 Sep 2013 19:42:40 +0000 (12:42 -0700)]
am
2ba03263: Make ROI size 1/8 of longer edge of the image
* commit '
2ba03263340639635120be467f8cabec2889aa08':
Make ROI size 1/8 of longer edge of the image
Doris Liu [Thu, 26 Sep 2013 19:32:38 +0000 (12:32 -0700)]
Make ROI size 1/8 of longer edge of the image
Bug:
10863323
Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
Doris Liu [Thu, 26 Sep 2013 18:24:37 +0000 (11:24 -0700)]
Finalize deletion when app exits and for last photo
Bug:
10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
Mangesh Ghiware [Thu, 26 Sep 2013 17:17:01 +0000 (10:17 -0700)]
am
22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
* commit '
22236064c8ec28196c07e847d4acb06e214deda8':
Use Camcorder label and icon for video camera activity.
Mangesh Ghiware [Thu, 26 Sep 2013 17:14:56 +0000 (17:14 +0000)]
Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 26 Sep 2013 04:36:01 +0000 (21:36 -0700)]
am
192686cf: (-s ours) Import translations. DO NOT MERGE
* commit '
192686cfde67ae1cc9933b865e8c196b363b54f7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Sep 2013 04:10:30 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fbfdbc9853215d57f6de75e33da059cd9cc4f43
Auto-generated-cl: translation import
Mangesh Ghiware [Wed, 25 Sep 2013 21:46:30 +0000 (14:46 -0700)]
Use Camcorder label and icon for video camera activity.
Bug:
10932790
Change-Id: If8847e06049e63116381904382db7dfcebb55010
Sascha Haeberling [Wed, 25 Sep 2013 21:40:59 +0000 (14:40 -0700)]
am
15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
* commit '
15ccccf6df50b465514eef85f64393d6f2022e0d':
Fix the checks for when to remove the HDR/HQ icons from the pie menu.
Sascha Haeberling [Wed, 25 Sep 2013 21:38:51 +0000 (21:38 +0000)]
Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 25 Sep 2013 21:31:49 +0000 (14:31 -0700)]
Fix the checks for when to remove the HDR/HQ icons from the pie menu.
Bug:
10932511
Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
Angus Kong [Wed, 25 Sep 2013 21:11:14 +0000 (14:11 -0700)]
am
c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
* commit '
c9c1504408819bda3fb6b2b264f9dbf6012f9b7f':
Checks for low storage in wide-angle pano mode.