OSDN Git Service
Baligh Uddin [Thu, 26 Sep 2013 06:27:33 +0000 (23:27 -0700)]
am
d859daee: (-s ours) am
192686cf: (-s ours) Import translations. DO NOT MERGE
* commit '
d859daee43f514a07032b64af7edf1e9f23ce3ad':
Import translations. DO NOT MERGE
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
Sascha Haeberling [Wed, 25 Sep 2013 21:43:11 +0000 (14:43 -0700)]
am
b80c1e77: am
15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
* commit '
b80c1e77fb59d56d8175f674e4c33931a19fc1b9':
Fix the checks for when to remove the HDR/HQ icons from the pie menu.
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:15:12 +0000 (14:15 -0700)]
am
e8e2011d: am
c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
* commit '
e8e2011d45b402b7c95d1bf3ee473d93aebe762f':
Checks for low storage in wide-angle pano mode.
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.
Angus Kong [Wed, 25 Sep 2013 21:08:03 +0000 (21:08 +0000)]
Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
Doris Liu [Wed, 25 Sep 2013 21:07:14 +0000 (14:07 -0700)]
am
e8cb214b: am
0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
* commit '
e8cb214bbde9f53f12985d22a71c2f9305175bb3':
Increase ROI size to 1/8 of the image width
Angus Kong [Wed, 25 Sep 2013 20:00:08 +0000 (13:00 -0700)]
Checks for low storage in wide-angle pano mode.
1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE.
2. Checks for low storage before start preview in wide-angle pano mode.
3. Add low storage warning message for debugging when in wide-angle pano mode.
bug:
10691367
Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
Doris Liu [Wed, 25 Sep 2013 21:03:50 +0000 (14:03 -0700)]
am
0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
* commit '
0537d4f7abe9e137f626e5cff3fcf252bb04c626':
Increase ROI size to 1/8 of the image width
Doris Liu [Wed, 25 Sep 2013 20:59:17 +0000 (20:59 +0000)]
Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
Baligh Uddin [Wed, 25 Sep 2013 20:01:54 +0000 (13:01 -0700)]
am
71c85612: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
71c856128eeca5741eb45423e85e6ad3f81bed37':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 19:59:22 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Doris Liu [Wed, 25 Sep 2013 19:22:08 +0000 (12:22 -0700)]
Increase ROI size to 1/8 of the image width
Bug:
10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
Angus Kong [Wed, 25 Sep 2013 19:24:51 +0000 (12:24 -0700)]
am
2ba69209: am
b998a491: Enlarge the native buffer of wide-angle-pano.
* commit '
2ba69209781c6b60a7f9a48153a2b0db85beb180':
Enlarge the native buffer of wide-angle-pano.
Angus Kong [Wed, 25 Sep 2013 19:17:11 +0000 (12:17 -0700)]
am
b998a491: Enlarge the native buffer of wide-angle-pano.
* commit '
b998a491a5b24e710bc1711dbb00cbfa05273bf2':
Enlarge the native buffer of wide-angle-pano.
Angus Kong [Wed, 25 Sep 2013 18:34:08 +0000 (11:34 -0700)]
Enlarge the native buffer of wide-angle-pano.
bug:
10654457
Change-Id: I6f5edda309b94f91986dd468bb4e3131fdcc6678
Baligh Uddin [Wed, 25 Sep 2013 17:06:13 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I760c80468210f750e4d614d7e4099680e032963a
Auto-generated-cl: translation import
Ruben Brunk [Wed, 25 Sep 2013 15:19:08 +0000 (08:19 -0700)]
am
acc3396d: am
be7dc627: Fix HQ mode change to allow return to regular photo mode.
* commit '
acc3396dfbf637189131c97ed5a6cafedb046d8b':
Fix HQ mode change to allow return to regular photo mode.
Sascha Haeberling [Wed, 25 Sep 2013 15:19:08 +0000 (08:19 -0700)]
am
531e36df: am
98f38bb0: Add HQ option and use it to switch to GCam.
* commit '
531e36df195d77cfb697b1602e4bbe147dec25d7':
Add HQ option and use it to switch to GCam.
Ruben Brunk [Wed, 25 Sep 2013 15:14:43 +0000 (08:14 -0700)]
am
be7dc627: Fix HQ mode change to allow return to regular photo mode.
* commit '
be7dc6279dfe17cb93fab8cf88d1115966acb2e0':
Fix HQ mode change to allow return to regular photo mode.
Sascha Haeberling [Wed, 25 Sep 2013 15:14:42 +0000 (08:14 -0700)]
am
98f38bb0: Add HQ option and use it to switch to GCam.
* commit '
98f38bb04daa3db49a072718cd8b5005b8b73af1':
Add HQ option and use it to switch to GCam.
Ruben Brunk [Wed, 25 Sep 2013 06:14:41 +0000 (23:14 -0700)]
Fix HQ mode change to allow return to regular photo mode.
Bug:
10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
Sascha Haeberling [Wed, 25 Sep 2013 01:58:34 +0000 (18:58 -0700)]
Add HQ option and use it to switch to GCam.
Bug:
10430748
Bug:
10785988
Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
Ruben Brunk [Wed, 25 Sep 2013 01:42:03 +0000 (18:42 -0700)]
am
7086b298: am
4601f5d9: Enable gcam as HDR pie menu option.
* commit '
7086b298e059b46b8c3e61299ce73f5315415a23':
Enable gcam as HDR pie menu option.
Ruben Brunk [Wed, 25 Sep 2013 01:39:22 +0000 (18:39 -0700)]
am
4601f5d9: Enable gcam as HDR pie menu option.
* commit '
4601f5d987ad2f57db6b1b65a716f00308e5ae99':
Enable gcam as HDR pie menu option.
Ruben Brunk [Wed, 25 Sep 2013 01:35:22 +0000 (18:35 -0700)]
Enable gcam as HDR pie menu option.
Bug:
10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e
Kevin Gabayan [Wed, 25 Sep 2013 00:31:54 +0000 (17:31 -0700)]
am
37f7a3ef: am
e0bf566d: Merge "Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
* commit '
37f7a3ef1544c32fd177c52323f82de9b872f2d8':
Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
Kevin Gabayan [Wed, 25 Sep 2013 00:27:40 +0000 (17:27 -0700)]
am
e0bf566d: Merge "Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
* commit '
e0bf566d4ab2c45e05635397bdfd6c9f9a92a356':
Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
Kevin Gabayan [Wed, 25 Sep 2013 00:25:55 +0000 (00:25 +0000)]
Merge "Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 24 Sep 2013 23:33:14 +0000 (16:33 -0700)]
am
38bddcc4: am
601d8041: Don\'t expose the Camera crop intent.
* commit '
38bddcc4b7d1993865f5ee4d52228826f7d791b4':
Don't expose the Camera crop intent.
Sascha Haeberling [Tue, 24 Sep 2013 23:30:11 +0000 (16:30 -0700)]
am
601d8041: Don\'t expose the Camera crop intent.
* commit '
601d804177a8d4abf02b2c0cb2805178f980c96b':
Don't expose the Camera crop intent.
Sascha Haeberling [Tue, 24 Sep 2013 23:25:13 +0000 (16:25 -0700)]
Don't expose the Camera crop intent.
Bug:
10912467
Change-Id: I2f03b7e7c84d76add7a43c30f097f902f1e25e56
Baligh Uddin [Tue, 24 Sep 2013 22:07:50 +0000 (15:07 -0700)]
am
f1b81feb: (-s ours) am
e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
f1b81feb4352fe0eed297f9b2cfa3adec18d8718':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 22:05:03 +0000 (15:05 -0700)]
am
e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
e5d39a522ff2f44fea8d56fddfbd785ddec8314a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 22:04:05 +0000 (15:04 -0700)]
am
e78ca833: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e78ca833b65e6745d255bc19441ac9a4a5aff52c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 22:02:41 +0000 (22:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Tue, 24 Sep 2013 21:57:16 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Mindy Pereira [Tue, 24 Sep 2013 21:37:28 +0000 (14:37 -0700)]
Mindy Pereira [Tue, 24 Sep 2013 21:31:14 +0000 (14:31 -0700)]
Mindy Pereira [Tue, 24 Sep 2013 02:12:13 +0000 (19:12 -0700)]
De-blue camera
fixes b/
10914366 de-blue camera
Change-Id: I36616639e701d7d76fb354e0911e5e64c973060d
Sascha Haeberling [Tue, 24 Sep 2013 20:39:59 +0000 (13:39 -0700)]
am
8c17960b: am
4863db01: Remove hideybars from Camera.
* commit '
8c17960b9714d0694530d914a103233bf793ff09':
Remove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 20:38:19 +0000 (13:38 -0700)]
am
4863db01: Remove hideybars from Camera.
* commit '
4863db01e3629a0a29c718b94445332ef74441e9':
Remove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 19:24:30 +0000 (12:24 -0700)]
Remove hideybars from Camera.
Bug:
10859173
Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
Doris Liu [Tue, 24 Sep 2013 19:01:20 +0000 (12:01 -0700)]
am
5c1c3b38: am
3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
* commit '
5c1c3b3814331302b02a0435e9ae9104f65e8ce4':
Fix SRI UX issues and improve UI efficiency
Doris Liu [Tue, 24 Sep 2013 18:59:37 +0000 (11:59 -0700)]
am
3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
* commit '
3180ac90af3e63ed7d9b487de5a35ba216d9463f':
Fix SRI UX issues and improve UI efficiency
Doris Liu [Tue, 24 Sep 2013 18:58:11 +0000 (18:58 +0000)]
Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
Doris Liu [Tue, 24 Sep 2013 03:43:20 +0000 (20:43 -0700)]
Fix SRI UX issues and improve UI efficiency
Bug:
10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
Angus Kong [Tue, 24 Sep 2013 16:34:12 +0000 (09:34 -0700)]
am
ee011517: am
c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
* commit '
ee0115170c47fde80ed410d753609b7ced377f5b':
Allow user to tap on lock icon from secure camera.
Angus Kong [Tue, 24 Sep 2013 16:31:40 +0000 (09:31 -0700)]
am
c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
* commit '
c74825b1666857cbfd0ad3750f0d509de8e86953':
Allow user to tap on lock icon from secure camera.
Angus Kong [Tue, 24 Sep 2013 16:28:50 +0000 (16:28 +0000)]
Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
Angus Kong [Sat, 21 Sep 2013 21:48:51 +0000 (14:48 -0700)]
Allow user to tap on lock icon from secure camera.
bug:
10857973
Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
Kevin Gabayan [Tue, 24 Sep 2013 02:00:52 +0000 (19:00 -0700)]
am
a014398a: am
d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
* commit '
a014398ae230523cc10696f4c4cdc0f9532cda11':
192x192 icon added to mipmap-xxxhdpi.
Sascha Haeberling [Tue, 24 Sep 2013 02:00:51 +0000 (19:00 -0700)]
am
2377df9a: am
8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
* commit '
2377df9a4e3fe0e6f036e9d885b72456c951fb80':
Localize the numbers in the time laps popup.
ztenghui [Tue, 24 Sep 2013 02:00:03 +0000 (19:00 -0700)]
am
f58ec27a: am
4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
* commit '
f58ec27a63538590fc6eaf87a38c69ca2ae05d2c':
Sort and select the preview fps range for still image.
Ruben Brunk [Tue, 24 Sep 2013 01:59:17 +0000 (18:59 -0700)]
am
a69f785c: am
283beaf6: Fix build: Don\'t build GCam for non-arm targets
* commit '
a69f785c11bd1efce8a94489e6c9ffe06146607d':
Fix build: Don't build GCam for non-arm targets
Kevin Gabayan [Tue, 24 Sep 2013 01:10:58 +0000 (18:10 -0700)]
am
d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
* commit '
d897d5c9048ba96d79b9893d0ebc7eb7e6b84260':
192x192 icon added to mipmap-xxxhdpi.
Kevin Gabayan [Tue, 24 Sep 2013 01:09:06 +0000 (01:09 +0000)]
Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
Kevin Gabayan [Mon, 23 Sep 2013 22:23:29 +0000 (15:23 -0700)]
Removed unused assets from Camera2
Bug:
10493013
Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
Sascha Haeberling [Tue, 24 Sep 2013 00:40:37 +0000 (17:40 -0700)]
am
8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
* commit '
8fed926c9f1a3b205165a2f9aad05379c85ececd':
Localize the numbers in the time laps popup.
Sascha Haeberling [Tue, 24 Sep 2013 00:37:29 +0000 (00:37 +0000)]
Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 23 Sep 2013 23:06:24 +0000 (16:06 -0700)]
Localize the numbers in the time laps popup.
Bug:
10889796
Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
ztenghui [Mon, 23 Sep 2013 21:31:41 +0000 (14:31 -0700)]
am
4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
* commit '
4c478ffe556bff91f9c7574384ab6d482c947627':
Sort and select the preview fps range for still image.
Baligh Uddin [Mon, 23 Sep 2013 21:31:34 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6579c8050e160f317ced1f098af607a622c8a87c
Auto-generated-cl: translation import
ztenghui [Mon, 23 Sep 2013 21:30:33 +0000 (21:30 +0000)]
Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
Baligh Uddin [Mon, 23 Sep 2013 21:14:42 +0000 (14:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69db8d31a7314f67babd49ec59d5c0fb5fb66516
Auto-generated-cl: translation import
ztenghui [Mon, 23 Sep 2013 18:35:36 +0000 (11:35 -0700)]
Sort and select the preview fps range for still image.
bug:
10842868
Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
Ruben Brunk [Mon, 23 Sep 2013 18:34:26 +0000 (11:34 -0700)]
am
283beaf6: Fix build: Don\'t build GCam for non-arm targets
* commit '
283beaf677d0c3235fbb22bfd5cd8338459bed1b':
Fix build: Don't build GCam for non-arm targets
Ruben Brunk [Mon, 23 Sep 2013 17:59:38 +0000 (10:59 -0700)]
Fix build: Don't build GCam for non-arm targets
Bug:
10430748
Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
Angus Kong [Sat, 21 Sep 2013 02:49:34 +0000 (19:49 -0700)]
am
4d017ab2: am
b21215a1: Improve the animation to filmstrip.
* commit '
4d017ab2085d5ade791358a23fca33b974afb4e3':
Improve the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 02:47:37 +0000 (19:47 -0700)]
am
b21215a1: Improve the animation to filmstrip.
* commit '
b21215a1a59812592380f31891becedbdec7468b':
Improve the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 01:41:46 +0000 (18:41 -0700)]
Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:
10806298
bug:
10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
Kevin Gabayan [Sat, 21 Sep 2013 00:06:07 +0000 (17:06 -0700)]
192x192 icon added to mipmap-xxxhdpi.
Change-Id: I2531fc226c97f5a3948f9616dc40e269e792b29c
Doris Liu [Fri, 20 Sep 2013 18:28:18 +0000 (11:28 -0700)]
am
00258a68: am
aa874428: Hide action bar after a timeout
* commit '
00258a685922bccf36be7c4938e837ca5d72bcb7':
Hide action bar after a timeout
Doris Liu [Fri, 20 Sep 2013 18:24:34 +0000 (11:24 -0700)]
am
aa874428: Hide action bar after a timeout
* commit '
aa8744284864cda5570e8dfa4eccc2747cee52dc':
Hide action bar after a timeout
Doris Liu [Thu, 19 Sep 2013 02:43:12 +0000 (19:43 -0700)]
Hide action bar after a timeout
Also make sure:
1) Action bar does not go away when the menu is showing
2) Extend the timeout if user swipe to a new image when action bar is visible
3) Hide action bar immediately when double-tap-to-zoom starts
4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode)
Bug:
10750342
Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
Angus Kong [Fri, 20 Sep 2013 01:23:54 +0000 (18:23 -0700)]
am
cb736218: am
cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
* commit '
cb7362183f68428db80a778ec65685526624f4c9':
Refine Filmstrip gesture/position handling.
Angus Kong [Fri, 20 Sep 2013 01:20:40 +0000 (18:20 -0700)]
am
cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
* commit '
cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7':
Refine Filmstrip gesture/position handling.
Angus Kong [Fri, 20 Sep 2013 01:18:33 +0000 (01:18 +0000)]
Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
Angus Kong [Thu, 19 Sep 2013 06:56:01 +0000 (23:56 -0700)]
Refine Filmstrip gesture/position handling.
bug:
10749052
bug:
10802996
bug:
10711578
Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
Baligh Uddin [Thu, 19 Sep 2013 21:42:44 +0000 (14:42 -0700)]
am
1106268f: (-s ours) am
4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
1106268ffb0050b2d52a345b6827954a91f54bae':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:38:47 +0000 (14:38 -0700)]
am
3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3aac79f2a9b67458ff4754c0a37fb4f09e78bfbd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:38:02 +0000 (14:38 -0700)]
am
4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
4821c5418d44d936ca222bfe1fdc1ac367e129f8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:35:41 +0000 (21:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 19 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Ruben Brunk [Thu, 19 Sep 2013 19:37:47 +0000 (12:37 -0700)]
am
75ad0584: am
30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
* commit '
75ad0584a13438fa113e5a9e201c6fe1af4880af':
Fix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:35:48 +0000 (12:35 -0700)]
am
30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
* commit '
30a21ea3356e87bdff0e072b840fa73215597326':
Fix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:33:09 +0000 (19:33 +0000)]
Merge "Fix drawable location." into gb-ub-photos-carlsbad
nicolasroard [Thu, 19 Sep 2013 19:25:39 +0000 (12:25 -0700)]
am
27d4468f: am
19ab725a: Add crop activity
* commit '
27d4468f90dd478839d864376edd0d40201bd80e':
Add crop activity
Ruben Brunk [Thu, 19 Sep 2013 19:23:39 +0000 (12:23 -0700)]
Fix drawable location.
Bug:
10430748
- Drawable wasn't included when building from klp-dev.
Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974
nicolasroard [Thu, 19 Sep 2013 19:22:35 +0000 (12:22 -0700)]
am
19ab725a: Add crop activity
* commit '
19ab725a5e640a1a20b1a6def083e37d1d1c1e20':
Add crop activity
nicolasroard [Wed, 18 Sep 2013 23:54:05 +0000 (16:54 -0700)]
Add crop activity
bug:
10367125
Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
ztenghui [Thu, 19 Sep 2013 18:17:40 +0000 (11:17 -0700)]
am
9e7cb170: am
064d6000: Use contentObserver to refresh the data when dirty.
* commit '
9e7cb170dfbb9884e2f47e30a8a0e60bded318ad':
Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 19 Sep 2013 18:16:14 +0000 (11:16 -0700)]
am
064d6000: Use contentObserver to refresh the data when dirty.
* commit '
064d6000933354f7bf344a41e0caa7052401c903':
Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 5 Sep 2013 22:47:58 +0000 (15:47 -0700)]
Use contentObserver to refresh the data when dirty.
Handle another setDataSource exception.
Remove the old work around for refreshing after editing.
bug:
10390298
Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
Mangesh Ghiware [Thu, 19 Sep 2013 18:06:10 +0000 (11:06 -0700)]
am
7806200a: am
a5682ab0: Bring back NFC beam support to filmstrip
* commit '
7806200aa5235dc8514411107d1603acea12e6b7':
Bring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 18:03:46 +0000 (11:03 -0700)]
am
a5682ab0: Bring back NFC beam support to filmstrip
* commit '
a5682ab08e1d42fe272ec877929478b4adb769f5':
Bring back NFC beam support to filmstrip