OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 28 Aug 2013 02:37:49 +0000 (02:37 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 67357aaf: am 20ef9163: am e40690d7: Updated printing in Gallery due to API changes.
Svetoslav Ganov [Wed, 28 Aug 2013 02:15:59 +0000 (19:15 -0700)]
am 67357aaf: am 20ef9163: am e40690d7: Updated printing in Gallery due to API changes.

* commit '67357aaf1948dafca93f900e6b76c3ec4be3c3ad':
  Updated printing in Gallery due to API changes.

10 years agoam 20ef9163: am e40690d7: Updated printing in Gallery due to API changes.
Svetoslav Ganov [Wed, 28 Aug 2013 02:13:14 +0000 (19:13 -0700)]
am 20ef9163: am e40690d7: Updated printing in Gallery due to API changes.

* commit '20ef91639d9ecd0362cd3c942bfedbc316ae7ffc':
  Updated printing in Gallery due to API changes.

10 years agoam e40690d7: Updated printing in Gallery due to API changes.
Svetoslav Ganov [Wed, 28 Aug 2013 02:10:59 +0000 (19:10 -0700)]
am e40690d7: Updated printing in Gallery due to API changes.

* commit 'e40690d73eb611f3f461f51a2841e73bcbd01f79':
  Updated printing in Gallery due to API changes.

10 years agoam e17bdac8: am 9c39b8b4: am 4d34f390: Cherry-pick of KLP CL (printing support)
Svetoslav Ganov [Wed, 28 Aug 2013 02:10:37 +0000 (19:10 -0700)]
am e17bdac8: am 9c39b8b4: am 4d34f390: Cherry-pick of KLP CL (printing support)

* commit 'e17bdac87f798d4bcb3fca79cd801ee56cbc03d9':
  Cherry-pick of KLP CL (printing support)

10 years agoam 9c39b8b4: am 4d34f390: Cherry-pick of KLP CL (printing support)
Svetoslav Ganov [Wed, 28 Aug 2013 02:07:52 +0000 (19:07 -0700)]
am 9c39b8b4: am 4d34f390: Cherry-pick of KLP CL (printing support)

* commit '9c39b8b4a3d107e71f4ef0c6997913562a43d41e':
  Cherry-pick of KLP CL (printing support)

10 years agoam 4d34f390: Cherry-pick of KLP CL (printing support)
Svetoslav Ganov [Wed, 28 Aug 2013 02:05:52 +0000 (19:05 -0700)]
am 4d34f390: Cherry-pick of KLP CL (printing support)

* commit '4d34f390561e002fddfa88f2a1273e16c8a90f00':
  Cherry-pick of KLP CL (printing support)

10 years agoUpdated printing in Gallery due to API changes.
Svetoslav Ganov [Tue, 27 Aug 2013 07:41:11 +0000 (00:41 -0700)]
Updated printing in Gallery due to API changes.

1. Now there is two fitting modes: scale to fill and scale to fit.
   Updated the Gallery print code to support them both.

2. Now we have APIs for specifying which constraints in the print
   attributes have been satisfied by the app so the pritner does
   not satisfy them again, e.g. if the app rotated the content then
   the printer should not do it.

Change-Id: I78b2925965068bd528fe6ec739bfd1e93084dd24

10 years agoCherry-pick of KLP CL
Svetoslav Ganov [Wed, 28 Aug 2013 01:20:42 +0000 (18:20 -0700)]
Cherry-pick of KLP CL
(printing support)

Fixing the build

Change-Id: I48eb47c071b2060dfea430cee968bf99225a8bb1

10 years agoam 87acbc45: am f7a69c78: am 655afcf4: Fix param border
nicolasroard [Wed, 28 Aug 2013 01:29:32 +0000 (18:29 -0700)]
am 87acbc45: am f7a69c78: am 655afcf4: Fix param border

* commit '87acbc45ad4ef822f158f0a05c1e1bfb0548f236':
  Fix param border

10 years agoam 3a3724f8: am 0707c77c: Fixing the build
Svetoslav Ganov [Wed, 28 Aug 2013 01:29:32 +0000 (18:29 -0700)]
am 3a3724f8: am 0707c77c: Fixing the build

* commit '3a3724f854f5e25f13c43b90c0c617f45ec4bc6b':
  Fixing the build

10 years agoam f7a69c78: am 655afcf4: Fix param border
nicolasroard [Wed, 28 Aug 2013 01:24:53 +0000 (18:24 -0700)]
am f7a69c78: am 655afcf4: Fix param border

* commit 'f7a69c78e0a8e7e25ec1c3be991b3968029998e9':
  Fix param border

10 years agoam 0707c77c: Fixing the build
Svetoslav Ganov [Wed, 28 Aug 2013 01:24:52 +0000 (18:24 -0700)]
am 0707c77c: Fixing the build

* commit '0707c77c8c61feaffb59558c7c164b35af3dcb1c':
  Fixing the build

10 years agoam 655afcf4: Fix param border
nicolasroard [Wed, 28 Aug 2013 01:23:21 +0000 (18:23 -0700)]
am 655afcf4: Fix param border

* commit '655afcf4a88cf9dcdbab708212df1dec0a4c05d6':
  Fix param border

10 years agoFixing the build
Svetoslav Ganov [Wed, 28 Aug 2013 01:20:42 +0000 (18:20 -0700)]
Fixing the build

Change-Id: I48eb47c071b2060dfea430cee968bf99225a8bb1

10 years agoFix param border
nicolasroard [Wed, 28 Aug 2013 01:01:16 +0000 (18:01 -0700)]
Fix param border

needed to replace bitmap borders

bug:9470514
Change-Id: I69f6324246ee8c9491ec430c5e20d87574302fcf

10 years agoam f67cc0c8: am 51713de0: am 8141e241: Merge "Improves UI / size" into gb-ub-photos...
nicolasroard [Tue, 27 Aug 2013 17:30:43 +0000 (10:30 -0700)]
am f67cc0c8: am 51713de0: am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad

* commit 'f67cc0c824b8122c4ec1f41ba889e2af25fce3f4':
  Improves UI / size

10 years agoam c8d70943: am 1b982d48: am 61c634ab: fix selection bug
John Hoford [Tue, 27 Aug 2013 17:30:39 +0000 (10:30 -0700)]
am c8d70943: am 1b982d48: am 61c634ab: fix selection bug

* commit 'c8d709436d4e294f61e60acc5b62898fc74d86fb':
  fix selection bug

10 years agoam 51713de0: am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad
nicolasroard [Tue, 27 Aug 2013 16:53:24 +0000 (09:53 -0700)]
am 51713de0: am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad

* commit '51713de0b3710ca90bc1d3b454cbdcee482b22dc':
  Improves UI / size

10 years agoam 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad
nicolasroard [Tue, 27 Aug 2013 16:49:28 +0000 (09:49 -0700)]
am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad

* commit '8141e2414467458c6e98b40845fc22a9cdcfffb0':
  Improves UI / size

10 years agoMerge "Improves UI / size" into gb-ub-photos-carlsbad
nicolasroard [Tue, 27 Aug 2013 16:48:08 +0000 (16:48 +0000)]
Merge "Improves UI / size" into gb-ub-photos-carlsbad

10 years agoam 1b982d48: am 61c634ab: fix selection bug
John Hoford [Tue, 27 Aug 2013 16:06:01 +0000 (09:06 -0700)]
am 1b982d48: am 61c634ab: fix selection bug

* commit '1b982d48cb86753c9605bf60a733dcfb1fceda69':
  fix selection bug

10 years agoam 61c634ab: fix selection bug
John Hoford [Tue, 27 Aug 2013 16:04:16 +0000 (09:04 -0700)]
am 61c634ab: fix selection bug

* commit '61c634ab70a10cbd68482ad03caa4470e9e9ecc5':
  fix selection bug

10 years agoImproves UI / size
nicolasroard [Fri, 23 Aug 2013 07:10:01 +0000 (00:10 -0700)]
Improves UI / size

- improves overdraw
- filter change anim
- better borders
- remove unused images

bug:9470514
bug:8658176

Change-Id: I764879be415acbfba5a36f239d1905ec54e2d3cb

10 years agofix selection bug
John Hoford [Tue, 27 Aug 2013 01:02:28 +0000 (18:02 -0700)]
fix selection bug

bug:4174707
Change-Id: Ia1a465e9f27d920d53545cba4c96dd3eab92e374

10 years agoam 6337ff93: am ad88a94e: am 0594bd40: Merge "fix menu indicator inconsistency" into...
John Hoford [Mon, 26 Aug 2013 22:24:25 +0000 (15:24 -0700)]
am 6337ff93: am ad88a94e: am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

* commit '6337ff93cec3248acc7bd4b7c3773b651e8cee8e':
  fix menu indicator inconsistency

10 years agoam 0d082a95: am d6de983c: am 3e6ca169: Merge "Prevent slide show request with only...
John Hoford [Mon, 26 Aug 2013 22:24:25 +0000 (15:24 -0700)]
am 0d082a95: am d6de983c: am 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

* commit '0d082a952b68c2aba281c9c2b9e06cd9f3ba5ffc':
  Prevent slide show request with only on slide

10 years agoam ad88a94e: am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos...
John Hoford [Mon, 26 Aug 2013 22:20:01 +0000 (15:20 -0700)]
am ad88a94e: am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

* commit 'ad88a94e96f30821598c9cc580e39db89510ccde':
  fix menu indicator inconsistency

10 years agoam d6de983c: am 3e6ca169: Merge "Prevent slide show request with only on slide" into...
John Hoford [Mon, 26 Aug 2013 22:20:01 +0000 (15:20 -0700)]
am d6de983c: am 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

* commit 'd6de983cf0e2d6b31ed73fc75ee9eae013718ff3':
  Prevent slide show request with only on slide

10 years agoam 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad
John Hoford [Mon, 26 Aug 2013 22:14:56 +0000 (15:14 -0700)]
am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

* commit '0594bd40959aaa55ec4f4204fbe3d12240f51480':
  fix menu indicator inconsistency

10 years agoam 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos...
John Hoford [Mon, 26 Aug 2013 22:14:55 +0000 (15:14 -0700)]
am 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

* commit '3e6ca1692d499fce6842c00428368598b68b86cb':
  Prevent slide show request with only on slide

10 years agoMerge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad
John Hoford [Mon, 26 Aug 2013 22:12:55 +0000 (22:12 +0000)]
Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

10 years agoMerge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad
John Hoford [Mon, 26 Aug 2013 22:12:44 +0000 (22:12 +0000)]
Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

10 years agoam 18cb2ad5: am 87863a9f: am fa2b9222: Make parsing integers for details dialog more...
Sascha Haeberling [Mon, 26 Aug 2013 22:10:27 +0000 (15:10 -0700)]
am 18cb2ad5: am 87863a9f: am fa2b9222: Make parsing integers for details dialog more robust.

* commit '18cb2ad531e4c4ef03a3f77ef0a955eeaed1f2c3':
  Make parsing integers for details dialog more robust.

10 years agoam 06590f94: am d818d9f6: am dc514bb1: Add .gitignore to Gallery2
Sascha Haeberling [Mon, 26 Aug 2013 22:10:27 +0000 (15:10 -0700)]
am 06590f94: am d818d9f6: am dc514bb1: Add .gitignore to Gallery2

* commit '06590f94f64061b3e77c928e807bc461805b2466':
  Add .gitignore to Gallery2

10 years agoam 0319d149: am 106b5333: am 5996f435: I18N the Gallery\'s Details dialog.
Sascha Haeberling [Mon, 26 Aug 2013 22:10:26 +0000 (15:10 -0700)]
am 0319d149: am 106b5333: am 5996f435: I18N the Gallery\'s Details dialog.

* commit '0319d1494d6459e89efd651b66495181acd4caad':
  I18N the Gallery's Details dialog.

10 years agoam 46a3d954: (-s ours) am 8119844c: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 26 Aug 2013 22:10:26 +0000 (15:10 -0700)]
am 46a3d954: (-s ours) am 8119844c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '46a3d954b85d60009218e820ee028bf1cd593224':
  Import translations. DO NOT MERGE

10 years agoam ebe3b7d4: (-s ours) am 8f7811d2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 22:10:25 +0000 (15:10 -0700)]
am ebe3b7d4: (-s ours) am 8f7811d2: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 87863a9f: am fa2b9222: Make parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 22:05:46 +0000 (15:05 -0700)]
am 87863a9f: am fa2b9222: Make parsing integers for details dialog more robust.

* commit '87863a9f3104a870916adcf3e096fc98d0adcfd2':
  Make parsing integers for details dialog more robust.

10 years agoam d818d9f6: am dc514bb1: Add .gitignore to Gallery2
Sascha Haeberling [Mon, 26 Aug 2013 22:02:30 +0000 (15:02 -0700)]
am d818d9f6: am dc514bb1: Add .gitignore to Gallery2

* commit 'd818d9f6cfa0811f40f70912aae845918a264e5c':
  Add .gitignore to Gallery2

10 years agoam 106b5333: am 5996f435: I18N the Gallery\'s Details dialog.
Sascha Haeberling [Mon, 26 Aug 2013 22:02:05 +0000 (15:02 -0700)]
am 106b5333: am 5996f435: I18N the Gallery\'s Details dialog.

* commit '106b533374ef3e5a898fe64cc6da7b9964f6d1e7':
  I18N the Gallery's Details dialog.

10 years agoam 8119844c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 26 Aug 2013 22:00:56 +0000 (15:00 -0700)]
am 8119844c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8119844cfdb392c793497b1a304d756374d0c426':
  Import translations. DO NOT MERGE

10 years agoam 8f7811d2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 22:00:53 +0000 (15:00 -0700)]
am 8f7811d2: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam fa2b9222: Make parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 21:56:41 +0000 (14:56 -0700)]
am fa2b9222: Make parsing integers for details dialog more robust.

* commit 'fa2b9222725e96fdb584aca1b1213b0bda8af110':
  Make parsing integers for details dialog more robust.

10 years agoMake parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 21:41:46 +0000 (14:41 -0700)]
Make parsing integers for details dialog more robust.

  Bug: 7141309

Also make sure "orientation" is localized.

Change-Id: Ib950eca6becd2eed21bebfbd48e11a182b76e45a

10 years agofix menu indicator inconsistency
John Hoford [Mon, 26 Aug 2013 21:39:10 +0000 (14:39 -0700)]
fix menu indicator inconsistency

bug:10492779
Change-Id: I5746bb2e8066ec985423a9d972d44593653d3c31

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 21:36:40 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE

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

10 years agoPrevent slide show request with only on slide
John Hoford [Fri, 23 Aug 2013 21:29:46 +0000 (14:29 -0700)]
Prevent slide show request with only on slide

bug:8794694
Change-Id: Id3354733c7f35d9303b01f07ddf30f5555b07ddd

10 years agoam dc514bb1: Add .gitignore to Gallery2
Sascha Haeberling [Fri, 23 Aug 2013 21:49:27 +0000 (14:49 -0700)]
am dc514bb1: Add .gitignore to Gallery2

* commit 'dc514bb1f6ad5927d76c5f5a52742428cb0846fa':
  Add .gitignore to Gallery2

10 years agoAdd .gitignore to Gallery2
Sascha Haeberling [Fri, 23 Aug 2013 20:48:00 +0000 (13:48 -0700)]
Add .gitignore to Gallery2

Change-Id: I071eb063f3cb26ee42134462958f49342ec54cd9

10 years agoam 5996f435: I18N the Gallery\'s Details dialog.
Sascha Haeberling [Fri, 23 Aug 2013 20:43:06 +0000 (13:43 -0700)]
am 5996f435: I18N the Gallery\'s Details dialog.

* commit '5996f43546b629a01166904943eda1f788078634':
  I18N the Gallery's Details dialog.

10 years agoI18N the Gallery's Details dialog.
Sascha Haeberling [Fri, 23 Aug 2013 20:29:42 +0000 (13:29 -0700)]
I18N the Gallery's Details dialog.

  Bug: 7141309

Change-Id: I9e658ea3972713fa39e76894f8ae7d8e3d5cdf2c

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 23 Aug 2013 19:03:13 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Aug 2013 17:23:37 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Aug 2013 17:22:54 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam ddf992d7: am 89cea037: am 49798939: border UI editor
John Hoford [Thu, 22 Aug 2013 23:13:34 +0000 (16:13 -0700)]
am ddf992d7: am 89cea037: am 49798939: border UI editor

* commit 'ddf992d7ed200a19e2f8c5d10b55bbcb03498c8e':
  border UI editor

10 years agoam 68625f46: am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.
Mangesh Ghiware [Thu, 22 Aug 2013 23:13:33 +0000 (16:13 -0700)]
am 68625f46: am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.

* commit '68625f46ad654a797e944a57d1c896585ffbd3a9':
  Add label to CameraLauncher activity-alias.

10 years agoam 1edf47e8: am dbeedf50: am eb295038: Fix the Google Drive issue
ztenghui [Thu, 22 Aug 2013 23:13:32 +0000 (16:13 -0700)]
am 1edf47e8: am dbeedf50: am eb295038: Fix the Google Drive issue

* commit '1edf47e823fb852c982dee21b20e27095000a2ef':
  Fix the Google Drive issue

10 years agoam e9315694: am e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad
John Hoford [Thu, 22 Aug 2013 23:13:32 +0000 (16:13 -0700)]
am e9315694: am e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'e9315694e17f381159437c34b6772edd4b2bd714':
  fix gif issue

10 years agoam 89cea037: am 49798939: border UI editor
John Hoford [Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)]
am 89cea037: am 49798939: border UI editor

* commit '89cea0376a0d012c6c7f5cf7a0cd6b0e739c9a2a':
  border UI editor

10 years agoam f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.
Mangesh Ghiware [Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)]
am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.

* commit 'f41385b0488b9d52d8707a8832de799852bb38e5':
  Add label to CameraLauncher activity-alias.

10 years agoam dbeedf50: am eb295038: Fix the Google Drive issue
ztenghui [Thu, 22 Aug 2013 23:09:44 +0000 (16:09 -0700)]
am dbeedf50: am eb295038: Fix the Google Drive issue

* commit 'dbeedf500d546cf6ffe18863edeaef05d001a84e':
  Fix the Google Drive issue

10 years agoam e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad
John Hoford [Thu, 22 Aug 2013 23:09:43 +0000 (16:09 -0700)]
am e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'e966541c27c1e00e1c0f3c4fea52cf4149f579b8':
  fix gif issue

10 years agoam 49798939: border UI editor
John Hoford [Thu, 22 Aug 2013 23:07:33 +0000 (16:07 -0700)]
am 49798939: border UI editor

* commit '49798939f1bc58eaf5842bbc8bc5424284ab7930':
  border UI editor

10 years agoam 73d0f429: Add label to CameraLauncher activity-alias.
Mangesh Ghiware [Thu, 22 Aug 2013 23:07:30 +0000 (16:07 -0700)]
am 73d0f429: Add label to CameraLauncher activity-alias.

* commit '73d0f42972c7c49a2589f2184f67e5a887007e7e':
  Add label to CameraLauncher activity-alias.

10 years agoam eb295038: Fix the Google Drive issue
ztenghui [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am eb295038: Fix the Google Drive issue

* commit 'eb2950384846a3797e13b04765f65df70d80982e':
  Fix the Google Drive issue

10 years agoam d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad
John Hoford [Thu, 22 Aug 2013 23:07:23 +0000 (16:07 -0700)]
am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'd74271e58c33ac178d935cca6843d41de95e7fcf':
  fix gif issue

10 years agoborder UI editor
John Hoford [Thu, 22 Aug 2013 21:38:19 +0000 (14:38 -0700)]
border UI editor

bug:9470514
Change-Id: I4d5cd91775c9b8742f847fd9a955f6f28e66cd38

10 years agoam 66ce8dea: (-s ours) am 0c352309: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 18:02:25 +0000 (11:02 -0700)]
am 66ce8dea: (-s ours) am 0c352309: (-s ours) Import translations. DO NOT MERGE

* commit '66ce8dea61d80e5ebbce6c46b75b544fa2bfe6f1':
  Import translations. DO NOT MERGE

10 years agoam 0c352309: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:23 +0000 (10:59 -0700)]
am 0c352309: (-s ours) Import translations. DO NOT MERGE

* commit '0c352309f6184214c2e001b3693223279f398144':
  Import translations. DO NOT MERGE

10 years agoAdd label to CameraLauncher activity-alias.
Mangesh Ghiware [Thu, 22 Aug 2013 01:18:03 +0000 (18:18 -0700)]
Add label to CameraLauncher activity-alias.

Bug: 10430717
Change-Id: I37f9e63483211ecfe11e4790361c051d377aef55

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:53:27 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:52:43 +0000 (16:52 -0700)]
Import translations. DO NOT MERGE

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

10 years agoFix the Google Drive issue
ztenghui [Tue, 20 Aug 2013 23:38:04 +0000 (16:38 -0700)]
Fix the Google Drive issue

Here a local cache file will be downloaded and sent over to Gallery / Editor.
So we need to handle that well.

bug:9356969

Change-Id: Ic09a2f5de2c9c55ca2ed21c77ddf7517f5939bfb

10 years agoMerge "fix gif issue" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 23:18:39 +0000 (23:18 +0000)]
Merge "fix gif issue" into gb-ub-photos-carlsbad

10 years agoam 901f3aea: am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into...
nicolasroard [Tue, 20 Aug 2013 23:02:48 +0000 (16:02 -0700)]
am 901f3aea: am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '901f3aea8c5644c567618410f9062d96d2527e70':
  Revert to loading 8888 bitmaps

10 years agoam 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos...
nicolasroard [Tue, 20 Aug 2013 23:01:03 +0000 (16:01 -0700)]
am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '1ee2d47e1dc72662cb63ba8c223d98f05e57ffea':
  Revert to loading 8888 bitmaps

10 years agoam 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
nicolasroard [Tue, 20 Aug 2013 22:58:58 +0000 (15:58 -0700)]
am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '82f3ed2cec637ce516cf0270dde8f910fe9f78e5':
  Revert to loading 8888 bitmaps

10 years agoMerge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
nicolasroard [Tue, 20 Aug 2013 22:58:10 +0000 (22:58 +0000)]
Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

10 years agofix gif issue
John Hoford [Tue, 20 Aug 2013 22:37:37 +0000 (15:37 -0700)]
fix gif issue

bug:7877538
Change-Id: I807198ca6d0d0db33fdbcc8b6bd1bf6dab9ba86a

10 years agoRevert to loading 8888 bitmaps
nicolasroard [Tue, 20 Aug 2013 22:46:41 +0000 (15:46 -0700)]
Revert to loading 8888 bitmaps

bug:10305385
Change-Id: I3c8ff6e848e79631f9b9e887244495b094e730a3

10 years agoam 6529e798: am 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.
Mangesh Ghiware [Tue, 20 Aug 2013 22:34:57 +0000 (15:34 -0700)]
am 6529e798: am 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '6529e798150f147feaf9445edbb27c4535a48fef':
  Fix discrepancy in RemoteViewsFactory impl.

10 years agoam 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.
Mangesh Ghiware [Tue, 20 Aug 2013 22:32:53 +0000 (15:32 -0700)]
am 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '6b1ef99f0e43564a5d7ea4e5c5e1a23baf055101':
  Fix discrepancy in RemoteViewsFactory impl.

10 years agoam 675948f8: Fix discrepancy in RemoteViewsFactory impl.
Mangesh Ghiware [Tue, 20 Aug 2013 22:31:47 +0000 (15:31 -0700)]
am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '675948f8f6337fe2873067a74db789d46a41ec36':
  Fix discrepancy in RemoteViewsFactory impl.

10 years agoFix discrepancy in RemoteViewsFactory impl.
Mangesh Ghiware [Tue, 20 Aug 2013 22:09:55 +0000 (15:09 -0700)]
Fix discrepancy in RemoteViewsFactory impl.

Bug: 7633198
Change-Id: I96db437ac4452d001a2c380ecdbedee40f4c2468

10 years agoam 9095869c: am 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb...
John Hoford [Tue, 20 Aug 2013 19:29:14 +0000 (12:29 -0700)]
am 9095869c: am 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '9095869cb4de4e00c44723f518a11a39e2b85dcf':
  fix draw issues on tablet

10 years agoam 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 19:27:20 +0000 (12:27 -0700)]
am 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '87f067fd20908a541b3ab6a9f06d5ea30d10aa28':
  fix draw issues on tablet

10 years agoam 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 19:25:03 +0000 (12:25 -0700)]
am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '708569b460235ed28248de1aefdd635197d3fb28':
  fix draw issues on tablet

10 years agoMerge "fix draw issues on tablet" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 19:22:44 +0000 (19:22 +0000)]
Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

10 years agofix draw issues on tablet
John Hoford [Tue, 20 Aug 2013 16:21:02 +0000 (09:21 -0700)]
fix draw issues on tablet

bug:8579593
Change-Id: I75c9daa4d1048b02943ab33362dd8674faa39149

10 years agoam b3ab5bda: am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 20 Aug 2013 17:16:48 +0000 (10:16 -0700)]
am b3ab5bda: am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit 'b3ab5bda54ee05fb5622d6d475132d76d7f07745':
  Prevent NPE.

10 years agoam 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 20 Aug 2013 17:14:35 +0000 (10:14 -0700)]
am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit '778acca3b6592ab5bc150f726b68e4af24d3c7e4':
  Prevent NPE.

10 years agoam 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 20 Aug 2013 17:13:12 +0000 (10:13 -0700)]
am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit '7a4412d19a355e78f472eba2f3a8d90234b69ee9':
  Prevent NPE.

10 years agoMerge "Prevent NPE." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 20 Aug 2013 17:10:17 +0000 (17:10 +0000)]
Merge "Prevent NPE." into gb-ub-photos-carlsbad

10 years agoam 10aedbc0: am 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based...
George Mount [Tue, 20 Aug 2013 16:42:55 +0000 (09:42 -0700)]
am 10aedbc0: am 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '10aedbc0919361965d65a959ee369df05c78bc8c':
  Allow for extension for pano-based navigation.

10 years agoam 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based navigation."...
George Mount [Tue, 20 Aug 2013 16:37:51 +0000 (09:37 -0700)]
am 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '3e5175060d84f83c0b2d26c3c19e88654ec0e5bb':
  Allow for extension for pano-based navigation.

10 years agoam 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos...
George Mount [Tue, 20 Aug 2013 16:35:52 +0000 (09:35 -0700)]
am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '2f3a8e1c95e1a689086e585a9db2482dc66ea39b':
  Allow for extension for pano-based navigation.

10 years agoMerge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad
George Mount [Tue, 20 Aug 2013 16:31:01 +0000 (16:31 +0000)]
Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

10 years agoPrevent NPE.
Sascha Haeberling [Tue, 20 Aug 2013 01:52:13 +0000 (18:52 -0700)]
Prevent NPE.

  Bug: 10388167

Change-Id: I9293d29e6a1a4f052513409b80fe7d4aaac87529

10 years agoam 8d02a559: am 14262b1c: am 929d90ca: Fix crash
nicolasroard [Tue, 20 Aug 2013 00:36:10 +0000 (17:36 -0700)]
am 8d02a559: am 14262b1c: am 929d90ca: Fix crash

* commit '8d02a5595b4c2941ecdc10bd84e3fc94b4fe0a06':
  Fix crash