git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Mangesh Ghiware [Fri, 28 Sep 2012 21:05:48 +0000 (14:05 -0700)]

am 639c9c6d: am f98aafb7: Fix NPE in GalleryActionBar

* commit '639c9c6d767f70ab83fb97b13b108bb1df06cabf':
Fix NPE in GalleryActionBar

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 21:03:58 +0000 (14:03 -0700)]

am f98aafb7: Fix NPE in GalleryActionBar

* commit 'f98aafb7eb65b889b0f831d607828ca4f8af64b6':
Fix NPE in GalleryActionBar

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 20:48:13 +0000 (13:48 -0700)]

Fix NPE in GalleryActionBar

Bug: 7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0

am 81286e10: am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches

* commit '81286e102219ce852f4d9ed1cb68b40fc8b1cb41':
Add FilterShow and clean up native lib handling

am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches

* commit '5e91df3d56be743664c1a4a760f1668ec1de17dd':
Add FilterShow and clean up native lib handling

Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 18:57:10 +0000 (11:57 -0700)]

am 91cb11f2: am 7caab0dc: Change the slider values range to -100 -> 100

* commit '91cb11f248a10b1b35621d092d9c0418e6867ede':
Change the slider values range to -100 -> 100

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 18:56:08 +0000 (11:56 -0700)]

am 7caab0dc: Change the slider values range to -100 -> 100

* commit '7caab0dc36f69b4c51c39bd191f2df44ea586b70':
Change the slider values range to -100 -> 100

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 18:46:33 +0000 (11:46 -0700)]

Change the slider values range to -100 -> 100

bug:7247494
Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0

am 20ee087f: am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches

* commit '20ee087f90ea1205761f4aa1f27f1914adad6bed':
Fixed behavior for back key when viewing download.

am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches

* commit '75a93c78cd2a09eff08c16c6fee2bf683f483027':
Fixed behavior for back key when viewing download.

Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches

Add FilterShow and clean up native lib handling

Bug: 7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos

Bug: 7250099
Remove native libs from the apk in /system/apps

Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266

commit | commitdiff | tree

Teng-Hui Zhu [Fri, 28 Sep 2012 17:15:57 +0000 (10:15 -0700)]

am 86a69307: am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches

* commit '86a693077dbd255939fe0c30edf046acfbff7974':
Trimming: Use OnClickListener for saving

commit | commitdiff | tree

Teng-Hui Zhu [Fri, 28 Sep 2012 17:14:19 +0000 (10:14 -0700)]

am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches

* commit '3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f':
Trimming: Use OnClickListener for saving

commit | commitdiff | tree

Teng-Hui Zhu [Fri, 28 Sep 2012 17:12:43 +0000 (10:12 -0700)]

Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:33:08 +0000 (09:33 -0700)]

am c697efde: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:33:07 +0000 (09:33 -0700)]

am 123f653f: (-s ours) am f8706c89: (-s ours) Import translations. DO NOT MERGE

* commit '123f653fef5182e4b0b3933a77e15146be6ad82a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:31:49 +0000 (09:31 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:31:38 +0000 (09:31 -0700)]

am f8706c89: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:29:59 +0000 (09:29 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:29:32 +0000 (09:29 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 16:28:41 +0000 (09:28 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Teng-Hui Zhu [Fri, 28 Sep 2012 16:10:21 +0000 (09:10 -0700)]

Trimming: Use OnClickListener for saving

bug:7093055

Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f

commit | commitdiff | tree

Bobby Georgescu [Fri, 28 Sep 2012 07:48:55 +0000 (00:48 -0700)]

am 3235768b: am c7e3c76d: Show a placeholder when the camera filmstrip is empty

* commit '3235768b6bf413e56fb76b469a7699a1df0107dd':
Show a placeholder when the camera filmstrip is empty

commit | commitdiff | tree

Bobby Georgescu [Fri, 28 Sep 2012 07:47:07 +0000 (00:47 -0700)]

am c7e3c76d: Show a placeholder when the camera filmstrip is empty

* commit 'c7e3c76d6965f520a9651d309052c5f01726cd58':
Show a placeholder when the camera filmstrip is empty

commit | commitdiff | tree

Bobby Georgescu [Thu, 27 Sep 2012 23:36:03 +0000 (16:36 -0700)]

Show a placeholder when the camera filmstrip is empty

Bug: 7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.

Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 06:51:31 +0000 (23:51 -0700)]

am bd1c876a: am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches

* commit 'bd1c876a885f14f489b612e90a1a8d94a5040732':
Update to sharing panorama

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 06:49:42 +0000 (23:49 -0700)]

am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches

* commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7':
Update to sharing panorama

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 06:48:44 +0000 (23:48 -0700)]

Merge "Update to sharing panorama" into gb-ub-photos-arches

commit | commitdiff | tree

Mangesh Ghiware [Fri, 28 Sep 2012 04:05:41 +0000 (21:05 -0700)]

Update to sharing panorama

Bug: 7150324

Use separate share intents for sharing panoarma and regular JPGs.

If photo is a 360 panorama, promote sharing it on the action bar,
and move sharing as JPG to overflow menu.

MIME type changed to specify panorama360.

Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 04:48:08 +0000 (21:48 -0700)]

am 625a1ec6: am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches

* commit '625a1ec63d3fa405d375fb74d6fb0544ae8b1b7f':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 04:45:54 +0000 (21:45 -0700)]

am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches

* commit '5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 04:43:57 +0000 (21:43 -0700)]

Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Fri, 28 Sep 2012 03:54:48 +0000 (20:54 -0700)]

Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.

bug:7234317
bug:7233975
bug:7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 04:12:58 +0000 (21:12 -0700)]

am 2a4847a6: (-s ours) am 8473d944: (-s ours) Import translations. DO NOT MERGE

* commit '2a4847a6fd70872b30b6824fb2c68118a27595dd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 04:12:57 +0000 (21:12 -0700)]

am 00495d88: (-s ours) Import translations. DO NOT MERGE

* commit '00495d882702b3c34724f8d0b972e882ae4363df':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 04:11:26 +0000 (21:11 -0700)]

am 8473d944: (-s ours) Import translations. DO NOT MERGE

* commit '8473d94491059a07e9969de14751d5d3fd929061':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 04:00:18 +0000 (21:00 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 03:59:55 +0000 (20:59 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 28 Sep 2012 03:59:05 +0000 (20:59 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bobby Georgescu [Fri, 28 Sep 2012 03:49:38 +0000 (20:49 -0700)]

am 8a7f0bd6: am 624ed9df: Fix up button behavior in camera app

* commit '8a7f0bd6c9897a8191bdefd26e4a67ab3a601548':
Fix up button behavior in camera app

commit | commitdiff | tree

Bobby Georgescu [Fri, 28 Sep 2012 03:48:09 +0000 (20:48 -0700)]

am 624ed9df: Fix up button behavior in camera app

* commit '624ed9df710ac4e34f3ff1d0c3bf4acd1c056258':
Fix up button behavior in camera app

commit | commitdiff | tree

Bobby Georgescu [Fri, 28 Sep 2012 01:10:06 +0000 (18:10 -0700)]

Fix up button behavior in camera app

Bug: 7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:33:06 +0000 (16:33 -0700)]

am 56c1aed4: am 863b4e65: We weren\'t applying the parameter on an existing filter

* commit '56c1aed46be3c42a169f9da3545cb565b0732107':
We weren't applying the parameter on an existing filter

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:30:51 +0000 (16:30 -0700)]

am 863b4e65: We weren\'t applying the parameter on an existing filter

* commit '863b4e65d172a19111f46e43f97e7e41927a3bc7':
We weren't applying the parameter on an existing filter

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:25:12 +0000 (16:25 -0700)]

We weren't applying the parameter on an existing filter

bug:7247494
Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:21:58 +0000 (16:21 -0700)]

am d019ac64: am 9579b815: Only apply the parameter to the currently edited filter

* commit 'd019ac64c24d03873ba5983193f3fb10163e625c':
Only apply the parameter to the currently edited filter

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:20:26 +0000 (16:20 -0700)]

am 9579b815: Only apply the parameter to the currently edited filter

* commit '9579b81504c16ac77aa7442767fbabe6abcfe24b':
Only apply the parameter to the currently edited filter

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 23:05:23 +0000 (16:05 -0700)]

Only apply the parameter to the currently edited filter

bug:7247494
Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1

am 9ad74d1f: am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches

* commit '9ad74d1f01a322173d259fce1f90a59de39cc903':
Fix Monkey NPE

am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches

* commit '98d17b863a5c8dc194496422459e73d7d38a2b9e':
Fix Monkey NPE

Merge "Fix Monkey NPE" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 22:54:12 +0000 (15:54 -0700)]

am 8d7ea82d: am 02f778af: Remove the pie slider, add a linear slider

* commit '8d7ea82d99eef07925f47237abef4ee5844e59ed':
Remove the pie slider, add a linear slider

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 22:50:51 +0000 (15:50 -0700)]

am 02f778af: Remove the pie slider, add a linear slider

* commit '02f778af1f8a2250d91da450f82c30572de96062':
Remove the pie slider, add a linear slider

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 22:10:28 +0000 (15:10 -0700)]

Remove the pie slider, add a linear slider

bug:7247494

Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79

Fix Monkey NPE

Bug: 7243032

Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 27 Sep 2012 21:23:17 +0000 (14:23 -0700)]

am cf5247ae: am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches

* commit 'cf5247ae5a105dfff156cb739619484c6e35b233':
Trimming: clean up the UI for trimming.

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 27 Sep 2012 21:21:42 +0000 (14:21 -0700)]

am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches

* commit '65f1bad399eca7fe1e31808f2cb0ad3c9399901e':
Trimming: clean up the UI for trimming.

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 27 Sep 2012 21:20:18 +0000 (14:20 -0700)]

Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 19:30:08 +0000 (12:30 -0700)]

am 4112a244: am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap

* commit '4112a24405bfe7591553c871eb3c17f8324dd0a2':
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 19:28:40 +0000 (12:28 -0700)]

am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap

* commit 'f37e1e9a9ce5aade5ccb1ad24b754bde29327716':
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 19:20:11 +0000 (12:20 -0700)]

Add the intent filter to start the new editor
Set Gallery to identify as needing a largeHeap

bug:7246621

Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 26 Sep 2012 23:34:44 +0000 (16:34 -0700)]

Trimming: clean up the UI for trimming.

Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.

bug:7093240

Change-Id: I61684e9723af12cecc212bbd911c23aab0258463

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 17:02:12 +0000 (10:02 -0700)]

am bb742fca: (-s ours) am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 17:00:20 +0000 (10:00 -0700)]

am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 16:58:26 +0000 (09:58 -0700)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 16:57:20 +0000 (09:57 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 16:57:08 +0000 (09:57 -0700)]

am f1ace7ee: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit | commitdiff | tree

Baligh Uddin [Thu, 27 Sep 2012 16:55:07 +0000 (09:55 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 27 Sep 2012 16:22:46 +0000 (09:22 -0700)]

am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches

* commit '27e933b00279c177ae0d36b599aa1c90870922c1':
Trimming: switch to use sherlock action bar

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 27 Sep 2012 16:21:14 +0000 (09:21 -0700)]

Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches

am 743f8152: Several secure album changes.

* commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5':
Several secure album changes.

Several secure album changes.

- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
"unlocked" lock.

bug:7192331

Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a

am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches

* commit '4419f551b4ccb7457626dbb5a37c41afd71eb5ed':
Don't set treat back as up if there is no parent album.

Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches

am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches

* commit 'b904ecba4fed5c6abd877a326acfbd0440887b62':
Show unlock image in secure album only when camera roll has items.

Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches

am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches

* commit '53605baff27905497fa38ec3887db1d031af5152':
Fix background replacement crash in camcorder.

Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches

Fix background replacement crash in camcorder.

Add proguard flag to prevent methods from removing.

bug:7106963
Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 02:09:32 +0000 (19:09 -0700)]

am e3f9f579: Load the correct library...

* commit 'e3f9f579d73af613a33ba1d0a93dc101ea671a69':
Load the correct library...

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 02:05:08 +0000 (19:05 -0700)]

Load the correct library...

bug:7165910
Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 00:52:55 +0000 (17:52 -0700)]

am 69d781ad: Fix the build

* commit '69d781ad1a135615a6d0e7cd6cf41db8fb9eabca':
Fix the build

commit | commitdiff | tree

nicolasroard [Thu, 27 Sep 2012 00:50:19 +0000 (17:50 -0700)]

Fix the build

Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 26 Sep 2012 21:20:46 +0000 (14:20 -0700)]

Trimming: switch to use sherlock action bar

Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.

bug:7093240

Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49

am 2ce4bec8: Only create debugTag if necessary

* commit '2ce4bec82fd46ff71ee4a586719904a6313689bf':
Only create debugTag if necessary

am 8fe22ecb: Don\'t requery a constant

* commit '8fe22ecb8e744a09a2e0d867f876ecbf74c82298':
Don't requery a constant

Only create debugTag if necessary

Bug: 7238418
String concatenation isn't free

Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931

Don't requery a constant

Bug: 7238418

Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b

commit | commitdiff | tree

nicolasroard [Wed, 26 Sep 2012 23:15:34 +0000 (16:15 -0700)]

am 0d7cdf8e: Initial import of the new image editor

* commit '0d7cdf8e763fb65c32bfad65245b3753deb75737':
Initial import of the new image editor

commit | commitdiff | tree

nicolasroard [Tue, 25 Sep 2012 21:27:56 +0000 (14:27 -0700)]

Initial import of the new image editor

bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3

commit | commitdiff | tree

Bobby Georgescu [Wed, 26 Sep 2012 22:49:07 +0000 (15:49 -0700)]

am 833f775a: Fix behavior of up button in Camera app

* commit '833f775afc9515567dc5aaf0cafe20e006e77545':
Fix behavior of up button in Camera app

commit | commitdiff | tree

Bobby Georgescu [Wed, 26 Sep 2012 21:22:57 +0000 (14:22 -0700)]

Fix behavior of up button in Camera app

Bug: 7233448
- Up button now goes to gallery root when appropriate.

Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224

commit | commitdiff | tree

Baligh Uddin [Wed, 26 Sep 2012 21:44:37 +0000 (14:44 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 26 Sep 2012 21:44:17 +0000 (14:44 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 26 Sep 2012 21:43:56 +0000 (14:43 -0700)]

Import translations. DO NOT MERGE

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

am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches

* commit '726cbd1af44cf7b0f795c4f0639b9b358be960c1':
Avoid unnecessary allocation

Merge "Avoid unnecessary allocation" into gb-ub-photos-arches

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 26 Sep 2012 20:51:09 +0000 (13:51 -0700)]

am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches

* commit 'eb90d7e21a4814a920de5c7d6e5f662d7f0e6865':
Trimming: switch to use selectors.