summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-08-1448-297/+2552
| | | | | Change-Id: Ia34aca8580f20e83bc16fbf979108d7c3b4299c0 Auto-generated-cl: translation import
* am dc31fa13: am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panelnicolasroard2013-08-144-71/+340
|\ | | | | | | | | * commit 'dc31fa1390a18192287d9a5998c894386b05d997': Fix UI Tablet for saturation panel
| * am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panelnicolasroard2013-08-144-71/+340
| |\ | | | | | | | | | | | | * commit '59d0ef1e099984fbf3a970f1587896c004c299f0': Fix UI Tablet for saturation panel
| | * am 2e1bc2e3: Fix UI Tablet for saturation panelnicolasroard2013-08-144-71/+340
| | |\ | | | | | | | | | | | | | | | | * commit '2e1bc2e37f285bfaf302a0533a372d4373474d9c': Fix UI Tablet for saturation panel
| | | * Fix UI Tablet for saturation panelnicolasroard2013-08-144-71/+340
| | | | | | | | | | | | | | | | Change-Id: Id2fffcefc8af3cf8f6ffe2c84447c3f54070f160
* | | | am 4ef12487: am e900ebaf: am 55a0279e: Fix for user presets remove menu item ↵nicolasroard2013-08-146-12/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | add spacer * commit '4ef12487669853d03f1c2f9cebd985d3f424d03a': Fix for user presets remove menu item add spacer
| * | | am e900ebaf: am 55a0279e: Fix for user presets remove menu item add spacernicolasroard2013-08-136-12/+95
| |\| | | | | | | | | | | | | | | | | | * commit 'e900ebaff73e80b12aa2ed02db98c7585726fd6f': Fix for user presets remove menu item add spacer
| | * | am 55a0279e: Fix for user presets remove menu item add spacernicolasroard2013-08-136-12/+95
| | |\| | | | | | | | | | | | | | | | | * commit '55a0279ee420c649606edd7815403d3ca1820c07': Fix for user presets remove menu item add spacer
| | | * Fix for user presetsnicolasroard2013-08-136-12/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove menu item add spacer Change-Id: I8a83aed6da00c6692f2204fefd17dfff3a599b8d
* | | | am 39d97be0: am 2f96b88b: am 665e2582: Merge "add solid round mode to draw" ↵John Hoford2013-08-145-3/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '39d97be0f297256aff6c11e5b6de184153dd919d': add solid round mode to draw
| * | | am 2f96b88b: am 665e2582: Merge "add solid round mode to draw" into ↵John Hoford2013-08-135-3/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '2f96b88b59216be04ec297798415b5850ab179e5': add solid round mode to draw
| | * | am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbadJohn Hoford2013-08-135-3/+15
| | |\| | | | | | | | | | | | | | | | | * commit '665e258238b1e1e0a821530416f2f709e61cb155': add solid round mode to draw
| | | * Merge "add solid round mode to draw" into gb-ub-photos-carlsbadJohn Hoford2013-08-145-3/+15
| | | |\
| | | | * add solid round mode to drawJohn Hoford2013-08-135-3/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I60249711602fa3aaf2bce0b5035e75f746caa5eb
* | | | | am ab56fe17: am 59afb28f: am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab56fe1721e292228096dc75c252497e61105463': Fix for translation strings
| * | | | am 59afb28f: am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '59afb28fece7333ba61bbf1738a70657f3884ef1': Fix for translation strings
| | * | | am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'fd55ffec5dbec1d37e4e8b32240bd51c7e85275b': Fix for translation strings
| | | * | Fix for translation stringsnicolasroard2013-08-131-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I2c89a377a8a439dd7b77d09a1362c4d6e68752df
* | | | am 66fe6472: am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into ↵nicolasroard2013-08-1310-72/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '66fe647204c5bd1a4d4720fad3af89b881e9ac51': Fix tablet UI layout
| * | | am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into ↵nicolasroard2013-08-1310-72/+84
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '627164c5d02c33c8a4224d34d0cabcd5c19951a0': Fix tablet UI layout
| | * | am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbadnicolasroard2013-08-1310-72/+84
| | |\| | | | | | | | | | | | | | | | | * commit '9977d45fcae932581c1788cf3fa96a3f4040a8dc': Fix tablet UI layout
| | | * Merge "Fix tablet UI layout" into gb-ub-photos-carlsbadnicolasroard2013-08-1310-72/+84
| | | |\
| | | | * Fix tablet UI layoutnicolasroard2013-08-1310-72/+84
| | | | | | | | | | | | | | | | | | | | Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f
* | | | | am 657f0a82: am 68b65c98: am dbc7f587: Merge "fix draw size and style ↵John Hoford2013-08-137-15/+200
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display" into gb-ub-photos-carlsbad * commit '657f0a82ba3583a408d5be03785982b224932507': fix draw size and style display
| * | | | am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into ↵John Hoford2013-08-137-15/+200
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '68b65c983e31b7a9923abb2eed5e8d736ddf7425': fix draw size and style display
| | * | | am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbadJohn Hoford2013-08-137-15/+200
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'dbc7f5878da3038fbe96609ad21b5324e9645367': fix draw size and style display
| | | * | Merge "fix draw size and style display" into gb-ub-photos-carlsbadJohn Hoford2013-08-137-15/+200
| | | |\ \
| | | | * | fix draw size and style displayJohn Hoford2013-08-137-15/+200
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a
* | | | | | am 69b22f7e: am 0581bac4: am 389e8c88: Remove old video camera icon and ↵Doris Liu2013-08-133-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | label from Gallery * commit '69b22f7eda0db8354109a96d1bdfd349e3e35a18': Remove old video camera icon and label from Gallery
| * | | | | am 0581bac4: am 389e8c88: Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0581bac494204a2dd5f246872d14691d562faa4b': Remove old video camera icon and label from Gallery
| | * | | | am 389e8c88: Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '389e8c887489db88e9324c17e8d29363198e7221': Remove old video camera icon and label from Gallery
| | | * | | Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| | | | |/ | | | |/| | | | | | | | | | | | | | | | Bug: 10296343 Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e
* | | | | am 6f8d98ba: am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be ↵nicolasroard2013-08-135-126/+258
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent" into gb-ub-photos-carlsbad * commit '6f8d98ba0a81e8ab39bed23406d33f170c7bd3ce': Fix icons rendering to be consistent
| * | | | am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into ↵nicolasroard2013-08-135-126/+258
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '9ad51bd2f4ad081b00281d51e257352bf9378147': Fix icons rendering to be consistent
| | * | | am c41fdd6f: Merge "Fix icons rendering to be consistent" into ↵nicolasroard2013-08-135-126/+258
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'c41fdd6f37df5dbd7f44b1c79cdd6d025937209d': Fix icons rendering to be consistent
| | | * | Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbadnicolasroard2013-08-135-126/+258
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix icons rendering to be consistentnicolasroard2013-08-135-126/+258
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e
* | | | | am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into ↵John Hoford2013-08-134-8/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '9b57886d0f6eba16a258cea1568a4c6d2ec4473c': add circle brush
| * | | | am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0': add circle brush
| | * | | am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419': add circle brush
| | | * | Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| | | |\ \
| | | | * | add circle brushJohn Hoford2013-08-124-8/+12
| | | | |/ | | | | | | | | | | | | | | | Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-131-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6b1d3673eeb65cfb84926820b9e7753624b073e Auto-generated-cl: translation import
* | | | | | am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix ↵Stephen Hines2013-08-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | build break by not redefining LOCAL_SHARED_LIBRARIES. * commit 'd1b3e27b8028ee1afcc3b34e8d7b7990849131bd': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
| * | | | | am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not ↵Stephen Hines2013-08-120-0/+0
|/| | | | | | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | redefining LOCAL_SHARED_LIBRARIES. * commit '4c89ec75151c28a905602b79f125583eba6edcd5': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
| * | | | am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining ↵Stephen Hines2013-08-120-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | LOCAL_SHARED_LIBRARIES. * commit '1b02bf1271af9d0f90e07ef2dd57fffd246f3b37': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
| | * | | DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.Stephen Hines2013-08-121-4/+0
| | | |/ | | |/| | | | | | | | | Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218
* | | | am 366c2ed3: Remove the unused libcutils.Ying Wang2013-08-121-4/+0
|\| | | | | | | | | | | | | | | | | | | * commit '366c2ed307e91ad1fa22554cff3a95c50c12402e': Remove the unused libcutils.
| * | | Remove the unused libcutils.Ying Wang2013-08-121-4/+0
| | | | | | | | | | | | | | | | Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499