OSDN Git Service
nicolasroard [Fri, 12 Oct 2012 18:03:37 +0000 (11:03 -0700)]
am
8d60ba1b: am
5a1b150c: am
e533f659: Fixes Rotate, Flip, Straighten tools.
* commit '
8d60ba1bc980915a6ad61280908143eb73a1e795':
Fixes Rotate, Flip, Straighten tools.
Baligh Uddin [Fri, 12 Oct 2012 18:03:36 +0000 (11:03 -0700)]
am
fc06f187: am
f18fa41a: am
ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
fc06f1871b9694746a482fb77cbdcde644053c9b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 18:02:52 +0000 (11:02 -0700)]
am
9d5dbc2b: am
fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
9d5dbc2b89d512b8c5860f31a4a1f1ccd26a4b71':
Import translations. DO NOT MERGE
Ruben Brunk [Fri, 12 Oct 2012 18:02:48 +0000 (11:02 -0700)]
am
871f505f: am
3d6fd0b2: am
11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
* commit '
871f505f2891a50203adeb962decc589343a5f5b':
Fixed apply bar text. Moved strings to xml.
Baligh Uddin [Fri, 12 Oct 2012 18:02:40 +0000 (11:02 -0700)]
am
44a4d00c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
44a4d00c5cdc0bdbf29699496fa513e890be7444':
Import translations. DO NOT MERGE
nicolasroard [Fri, 12 Oct 2012 03:18:46 +0000 (20:18 -0700)]
am
5a1b150c: am
e533f659: Fixes Rotate, Flip, Straighten tools.
* commit '
5a1b150c965a68403c77bfe6e94036bd7535b745':
Fixes Rotate, Flip, Straighten tools.
Baligh Uddin [Fri, 12 Oct 2012 03:18:45 +0000 (20:18 -0700)]
am
f18fa41a: am
ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
f18fa41a47709f2343b209273c40d21f852502f0':
Import translations. DO NOT MERGE
nicolasroard [Fri, 12 Oct 2012 03:17:18 +0000 (20:17 -0700)]
am
e533f659: Fixes Rotate, Flip, Straighten tools.
* commit '
e533f65961ed601ded1803caeab6cef0a778d2f2':
Fixes Rotate, Flip, Straighten tools.
Baligh Uddin [Fri, 12 Oct 2012 03:17:18 +0000 (20:17 -0700)]
am
ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ecaa3f5474782f8333328fb312f464c56b3b73dc':
Import translations. DO NOT MERGE
nicolasroard [Fri, 12 Oct 2012 01:12:09 +0000 (18:12 -0700)]
Fixes Rotate, Flip, Straighten tools.
bug:
7314849
Bug:
7224232
Bug:
7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
Baligh Uddin [Fri, 12 Oct 2012 00:32:40 +0000 (17:32 -0700)]
am
fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
fe8124488e542fe41b3cb3f53edb13c65b745ee1':
Import translations. DO NOT MERGE
Ruben Brunk [Fri, 12 Oct 2012 00:31:12 +0000 (17:31 -0700)]
am
3d6fd0b2: am
11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
* commit '
3d6fd0b237fccafb3331a5f8a3505a07928f6f3d':
Fixed apply bar text. Moved strings to xml.
Baligh Uddin [Fri, 12 Oct 2012 00:30:29 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 00:30:05 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 12 Oct 2012 00:29:13 +0000 (17:29 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 00:28:17 +0000 (17:28 -0700)]
am
11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
* commit '
11a21df4be6984a180e27b9915a9d6af7e7ef359':
Fixed apply bar text. Moved strings to xml.
Ruben Brunk [Fri, 12 Oct 2012 00:26:29 +0000 (17:26 -0700)]
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
Chris Craik [Fri, 12 Oct 2012 00:25:38 +0000 (17:25 -0700)]
am
53cb08e1: am
20286576: am
8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
* commit '
53cb08e160e30f5f2cd3eb6d98bc94773cc25adc':
Alias com.android.camera.Camera to point at CameraActivity
Chris Craik [Fri, 12 Oct 2012 00:23:45 +0000 (17:23 -0700)]
am
20286576: am
8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
* commit '
2028657604c9a41aa3d88f09715206cf81b54bab':
Alias com.android.camera.Camera to point at CameraActivity
John Hoford [Fri, 12 Oct 2012 00:23:40 +0000 (17:23 -0700)]
am
9fcd67cf: am
f685a36c: am
a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
* commit '
9fcd67cfbf8b083be865d0ba2c85a50ff0c4b780':
fixed manta image size and double FX issue
Chris Craik [Fri, 12 Oct 2012 00:15:51 +0000 (17:15 -0700)]
am
8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
* commit '
8e9072b0a95d48caa8b1d9cdb9b385e92c33e292':
Alias com.android.camera.Camera to point at CameraActivity
Baligh Uddin [Fri, 12 Oct 2012 00:15:23 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05c99d9083d905ee1045c715a3e12389e1029f06
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Oct 2012 00:14:57 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac26add0f2724c7a910f045e481400cb9cb193b2
Auto-generated-cl: translation import
Michael Kolb [Fri, 12 Oct 2012 00:14:23 +0000 (17:14 -0700)]
am
b600b434: am
468e33b2: am
310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
* commit '
b600b43492afef5837052496434f2847d503637b':
Remove old 360 icons
Baligh Uddin [Fri, 12 Oct 2012 00:14:06 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a906b470bbc7e5d15958962b6818732a85d37fb
Auto-generated-cl: translation import
Chris Craik [Fri, 12 Oct 2012 00:14:05 +0000 (17:14 -0700)]
Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
Sascha Haeberling [Fri, 12 Oct 2012 00:14:05 +0000 (17:14 -0700)]
am
23236203: am
60c536e0: am
93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
* commit '
23236203371bc90821d8e9c2f7641c0003d26ac7':
Removing the disabled undo button.
Bobby Georgescu [Fri, 12 Oct 2012 00:13:48 +0000 (17:13 -0700)]
am
e37de750: am
87da4055: am
dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
* commit '
e37de750bdc78e522ed44570e6aeaff06ab66bec':
Change ActionBar spinner text size on rotate
Mangesh Ghiware [Fri, 12 Oct 2012 00:13:47 +0000 (17:13 -0700)]
am
d35afdce: am
e7b51ae0: am
825afb1b: Move calls to LightCycleHelper off the UI thread.
* commit '
d35afdce4a6735391fae7e68256f624601c6893b':
Move calls to LightCycleHelper off the UI thread.
Doris Liu [Fri, 12 Oct 2012 00:13:20 +0000 (17:13 -0700)]
am
2bbffd74: am
abe40160: am
47df0d2f: Add more space between save icon and text
* commit '
2bbffd7417e091ad1806e4ab0d197d20d44d500e':
Add more space between save icon and text
John Hoford [Fri, 12 Oct 2012 00:11:36 +0000 (17:11 -0700)]
am
f685a36c: am
a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
* commit '
f685a36c85c9b8182f9afdcd98df3338a9b5b3ed':
fixed manta image size and double FX issue
George Mount [Fri, 12 Oct 2012 00:10:45 +0000 (17:10 -0700)]
am
814bef58: am
b4ac748d: am
37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
* commit '
814bef58c622cc8f86a68a88de47affddee584b3':
Clear cached stitching preview thumbnails.
John Hoford [Fri, 12 Oct 2012 00:10:38 +0000 (17:10 -0700)]
am
a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
* commit '
a4ccb4af475fbabf637dd48bf68db449ea7c8197':
fixed manta image size and double FX issue
Bobby Georgescu [Fri, 12 Oct 2012 00:10:33 +0000 (17:10 -0700)]
am
4fac10d0: am
ea058692: am
bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
* commit '
4fac10d003fd27ccfa83f28d4e218ac9f6cec39e':
Fix size of peripheral items when first opening filmstrip
Baligh Uddin [Fri, 12 Oct 2012 00:10:32 +0000 (17:10 -0700)]
am
eebbf294: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
eebbf294f97c46061490cce0d664926204683df7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 00:10:29 +0000 (17:10 -0700)]
am
38cacaa0: am
62e34dfe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
38cacaa012058eb0912f051a838b21876fa91a92':
Import translations. DO NOT MERGE
John Hoford [Fri, 12 Oct 2012 00:10:29 +0000 (17:10 -0700)]
am
0ff263c5: am
11065123: am
7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
* commit '
0ff263c54b34df4cb418d12b35e31adab8444fc3':
Fix application of FX to not wipe out borders etc.
Baligh Uddin [Fri, 12 Oct 2012 00:10:28 +0000 (17:10 -0700)]
am
8bd7ff68: am
e8124973: am
f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8bd7ff68a14acc362b8bd8aad024da874eb6b31a':
Import translations. DO NOT MERGE
John Reck [Fri, 12 Oct 2012 00:10:27 +0000 (17:10 -0700)]
am
261109bf: am
075b593a: am
5cca8b99: Fix portrait orientation on landscape devices
* commit '
261109bf4527197f4118f9886aa3951655767dec':
Fix portrait orientation on landscape devices
John Hoford [Fri, 12 Oct 2012 00:09:39 +0000 (17:09 -0700)]
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
Michael Kolb [Fri, 12 Oct 2012 00:00:44 +0000 (17:00 -0700)]
am
468e33b2: am
310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
* commit '
468e33b2475be63accd296dad51251cf1714494d':
Remove old 360 icons
Ruben Brunk [Thu, 11 Oct 2012 22:16:58 +0000 (15:16 -0700)]
Fixed apply bar text. Moved strings to xml.
Bug:
7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
Michael Kolb [Thu, 11 Oct 2012 23:58:22 +0000 (16:58 -0700)]
am
310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
* commit '
310a93dc17574f3595b03da6988a2fbf3b382f51':
Remove old 360 icons
Michael Kolb [Thu, 11 Oct 2012 23:56:27 +0000 (16:56 -0700)]
Merge "Remove old 360 icons" into gb-ub-photos-arches
Sascha Haeberling [Thu, 11 Oct 2012 23:40:31 +0000 (16:40 -0700)]
am
60c536e0: am
93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
* commit '
60c536e0cb27b085c14c78f421ed3cd5517b36be':
Removing the disabled undo button.
Sascha Haeberling [Thu, 11 Oct 2012 23:37:57 +0000 (16:37 -0700)]
am
93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
* commit '
93f074e4672b81a5a4e38ea7ddebe3c916ccddfd':
Removing the disabled undo button.
Sascha Haeberling [Thu, 11 Oct 2012 23:36:05 +0000 (16:36 -0700)]
Merge "Removing the disabled undo button." into gb-ub-photos-arches
Chris Craik [Thu, 11 Oct 2012 21:06:45 +0000 (14:06 -0700)]
Alias com.android.camera.Camera to point at CameraActivity
bug:
7291128
Change-Id: Id6649024516ba79fa042284db95d29a37552eef4
Michael Kolb [Thu, 11 Oct 2012 23:26:00 +0000 (16:26 -0700)]
Remove old 360 icons
Bug:
7331839
Change-Id: Ie2de6336cd1c485ddacf51b6092c29f6feb9e4da
Sascha Haeberling [Thu, 11 Oct 2012 23:04:01 +0000 (16:04 -0700)]
Removing the disabled undo button.
Bug:
7333546
Addendum to http://go/ag//#/c/238167/
Change-Id: If39d93ffa9367ecd6b731c2c32ed0cab055000f4
Bobby Georgescu [Thu, 11 Oct 2012 23:02:42 +0000 (16:02 -0700)]
am
87da4055: am
dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
* commit '
87da4055bb066419e0d41114e4ac160730532dff':
Change ActionBar spinner text size on rotate
Bobby Georgescu [Thu, 11 Oct 2012 23:01:32 +0000 (16:01 -0700)]
am
dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
* commit '
dd1586912b5da958b33a0d9f07312160d1cb103b':
Change ActionBar spinner text size on rotate
Bobby Georgescu [Thu, 11 Oct 2012 23:00:01 +0000 (16:00 -0700)]
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
Mangesh Ghiware [Thu, 11 Oct 2012 22:55:45 +0000 (15:55 -0700)]
am
e7b51ae0: am
825afb1b: Move calls to LightCycleHelper off the UI thread.
* commit '
e7b51ae035063faf4da2544db8452442cf36df59':
Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 22:54:13 +0000 (15:54 -0700)]
am
825afb1b: Move calls to LightCycleHelper off the UI thread.
* commit '
825afb1b3e7d15b5c258d664ee008dc68da1c407':
Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 01:37:24 +0000 (18:37 -0700)]
Move calls to LightCycleHelper off the UI thread.
Bug:
7320303
Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.
Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
Bobby Georgescu [Thu, 11 Oct 2012 21:49:09 +0000 (14:49 -0700)]
Change ActionBar spinner text size on rotate
Bug:
7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.
Change-Id: If822b21899172a35402477868d4f146a8e00cfea
Doris Liu [Thu, 11 Oct 2012 22:06:35 +0000 (15:06 -0700)]
am
abe40160: am
47df0d2f: Add more space between save icon and text
* commit '
abe4016010184a230a45b5ae8fdca88a0ef21672':
Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 22:04:43 +0000 (15:04 -0700)]
am
47df0d2f: Add more space between save icon and text
* commit '
47df0d2ffb68ae01ee7732b890c4510b8a167616':
Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 21:51:13 +0000 (14:51 -0700)]
Add more space between save icon and text
Bug:
7333278
Change-Id: Ief263b9cecc3448b85d00c0e5fc05e8b80cc9bdd
John Hoford [Thu, 11 Oct 2012 19:55:05 +0000 (12:55 -0700)]
fixed manta image size and double FX issue
bug:
7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
George Mount [Thu, 11 Oct 2012 17:37:36 +0000 (10:37 -0700)]
am
b4ac748d: am
37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
* commit '
b4ac748ddeb297b8f87e71182ef93c3b57fe2049':
Clear cached stitching preview thumbnails.
George Mount [Thu, 11 Oct 2012 17:35:42 +0000 (10:35 -0700)]
am
37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
* commit '
37a9333651cead185d982d9b809cb3425a24d3d8':
Clear cached stitching preview thumbnails.
George Mount [Thu, 11 Oct 2012 17:35:01 +0000 (10:35 -0700)]
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 17:21:35 +0000 (10:21 -0700)]
am
ea058692: am
bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
* commit '
ea058692b6be37e9abb6f3b002428dfd4abd6e70':
Fix size of peripheral items when first opening filmstrip
Bobby Georgescu [Thu, 11 Oct 2012 17:19:30 +0000 (10:19 -0700)]
am
bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
* commit '
bebc94be08667b474587592169155e6cb9855e77':
Fix size of peripheral items when first opening filmstrip
Baligh Uddin [Thu, 11 Oct 2012 17:18:06 +0000 (10:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Bobby Georgescu [Thu, 11 Oct 2012 17:17:40 +0000 (10:17 -0700)]
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
Baligh Uddin [Thu, 11 Oct 2012 17:14:41 +0000 (10:14 -0700)]
am
62e34dfe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
62e34dfe4d0ab148595b7b0a7172b150e8a25601':
Import translations. DO NOT MERGE
John Hoford [Thu, 11 Oct 2012 17:14:40 +0000 (10:14 -0700)]
am
11065123: am
7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
* commit '
110651236a1ce10c360de0b0ed761514281d61d8':
Fix application of FX to not wipe out borders etc.
Baligh Uddin [Thu, 11 Oct 2012 17:13:36 +0000 (10:13 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
John Hoford [Thu, 11 Oct 2012 17:13:21 +0000 (10:13 -0700)]
am
7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
* commit '
7f34a6a5f21209c22584680f280723584e2c28e7':
Fix application of FX to not wipe out borders etc.
Baligh Uddin [Thu, 11 Oct 2012 17:12:15 +0000 (10:12 -0700)]
am
e8124973: am
f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
e8124973c4e78652df05a21a1ce69e8624d45390':
Import translations. DO NOT MERGE
John Hoford [Thu, 11 Oct 2012 17:11:57 +0000 (10:11 -0700)]
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
Baligh Uddin [Thu, 11 Oct 2012 17:11:10 +0000 (10:11 -0700)]
am
f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
f3dd4ce8620390b8a041afbc045fc789b6e17ad1':
Import translations. DO NOT MERGE
John Reck [Thu, 11 Oct 2012 17:10:46 +0000 (10:10 -0700)]
am
075b593a: am
5cca8b99: Fix portrait orientation on landscape devices
* commit '
075b593a4fe8a0613cc1edf43ee93ba525ccdc41':
Fix portrait orientation on landscape devices
Baligh Uddin [Thu, 11 Oct 2012 17:10:19 +0000 (10:10 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
John Reck [Thu, 11 Oct 2012 17:08:55 +0000 (10:08 -0700)]
am
5cca8b99: Fix portrait orientation on landscape devices
* commit '
5cca8b99bebe6a9fbb191a8e1364b81e309a1390':
Fix portrait orientation on landscape devices
George Mount [Thu, 11 Oct 2012 16:51:32 +0000 (09:51 -0700)]
Clear cached stitching preview thumbnails.
Bug
7328408
Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
John Reck [Thu, 11 Oct 2012 16:40:18 +0000 (09:40 -0700)]
Fix portrait orientation on landscape devices
Bug:
7328349
Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
John Hoford [Thu, 11 Oct 2012 16:13:40 +0000 (09:13 -0700)]
Fix application of FX to not wipe out borders etc.
bug:
7289442
Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
The Android Open Source Project [Thu, 11 Oct 2012 15:05:49 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3b25f3be4ac925e05cc72ff901944db93a6707af
The Android Automerger [Thu, 11 Oct 2012 14:04:10 +0000 (07:04 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:57:51 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib71f045b334b0f3548a6fda74f7e2ce2253d4bda
Ruben Brunk [Thu, 11 Oct 2012 07:42:10 +0000 (00:42 -0700)]
am
6c4ace2a: am
b6adfcf8: am
fb6edb42: Remove compare and reset from apply bar and fix text.
* commit '
6c4ace2a8d1299ff6f840212b4bff841a1571fda':
Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 07:40:16 +0000 (00:40 -0700)]
am
b6adfcf8: am
fb6edb42: Remove compare and reset from apply bar and fix text.
* commit '
b6adfcf8a485da464378bb8907698a08852a68ed':
Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 07:38:15 +0000 (00:38 -0700)]
am
fb6edb42: Remove compare and reset from apply bar and fix text.
* commit '
fb6edb42e7e0b132844d4e87c2a76c758f48b684':
Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 01:28:12 +0000 (18:28 -0700)]
Remove compare and reset from apply bar and fix text.
Bug:
7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
Bart Sears [Thu, 11 Oct 2012 07:30:59 +0000 (00:30 -0700)]
am
7836cef9: am
6190cbd6: am
73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
* commit '
7836cef9596d365655387d587e36e4db7b0ab988':
Hide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 07:29:35 +0000 (00:29 -0700)]
am
38a8ee6d: am
23c1f701: am
7761357f: Behavior of camera filmstrip in gallery closer to camera
* commit '
38a8ee6d63497308dd185deddd1d0db2efe50c35':
Behavior of camera filmstrip in gallery closer to camera
Bart Sears [Thu, 11 Oct 2012 07:29:06 +0000 (00:29 -0700)]
am
6190cbd6: am
73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
* commit '
6190cbd657b98f3ba74548f2d883c84cbc290af5':
Hide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 07:27:39 +0000 (00:27 -0700)]
am
23c1f701: am
7761357f: Behavior of camera filmstrip in gallery closer to camera
* commit '
23c1f701d84b2e006afa8f3c9a073fc5a34922cb':
Behavior of camera filmstrip in gallery closer to camera
Bart Sears [Thu, 11 Oct 2012 07:26:59 +0000 (00:26 -0700)]
am
73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
* commit '
73c60ceed9a8df0907cee52d804100f65771f3b6':
Hide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 07:25:51 +0000 (00:25 -0700)]
am
7761357f: Behavior of camera filmstrip in gallery closer to camera
* commit '
7761357f4a55de6745ac5172355d1a09a9a37492':
Behavior of camera filmstrip in gallery closer to camera
Bart Sears [Thu, 11 Oct 2012 07:25:17 +0000 (00:25 -0700)]
Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 07:25:06 +0000 (00:25 -0700)]
am
0e74d473: am
a261467e: am
4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '
0e74d473b3be1ef365f254496919a2610b8e90ed':
Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 07:23:10 +0000 (00:23 -0700)]
am
a261467e: am
4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '
a261467ecd5cc8433728185b31e3660c279a3be0':
Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 06:48:52 +0000 (23:48 -0700)]
Behavior of camera filmstrip in gallery closer to camera
Bug:
7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
Bobby Georgescu [Thu, 11 Oct 2012 07:20:40 +0000 (00:20 -0700)]
am
4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '
4d302b8a826ece492c2abefd56b780a65899663e':
Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 06:29:18 +0000 (23:29 -0700)]
Fix size of peripheral items when first opening filmstrip
Bug:
7327570
Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff