summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Fix batches of issues in movie effectswjiang2014-11-0411-52/+126
| | | | | | | | | | | | | | | | | | | | Fix following issues: - All settings aren't restored to previous state when user cancel his operations. - Check the validity to avoid calling member function of an already released object. - Recycle effect instance when MovieActivity pauses. - Don't restore strength from pref when toggling switch. - Force the Effect's dialog to be uncancelable. - Fix null pointer and effect leak issue due to CMCC features. - Fix audio effects dialog display on small screens. - Recognize bluetooth headset. - Update visual design. Conflicts: src/com/android/gallery3d/ui/Knob.java Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1
* Gallery2: Customize features for regional packagekaiyiz2014-11-044-3/+34
| | | | | | - Support user link to net to see more images. Change-Id: I4c095bd124057c996d4bf0d3a4a035b6587db640
* Gallery2: add some video featuresLikai Ding2014-11-0479-421/+1917
| | | | | | | including: previous/next video play mode, screen mode, fast forward/rewind button, step settings. Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e
* Gallery2: add some video featuresLikai Ding2014-11-0460-0/+1150
| | | | | | | (cherry picked files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Ifdcc4e9ab14d1f8b273faa97f0f66ba2f4034bea
* Gallery2: support live streaming and bookmarksLikai Ding2014-11-0431-1267/+2576
| | | | | | | Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
* Gallery2: support live streaming and bookmarksLikai Ding2014-11-0415-0/+1976
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Idc254cf0f7e8a9b492203313fa63349d07d19d5c
* Gallery2: support stereo/single track play modeLikai Ding2014-11-0410-26/+152
| | | | | | User can select stereo/single track play mode. Change-Id: I8225739815484f3c288823802f68478cb457725e
* Gallery2: support stereo/single track play modeLikai Ding2014-11-043-0/+118
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I2d7d523ca586a031c3fb139eda321d5073b30589
* Gallery2: support loop/single video play modeLikai Ding2014-11-0428-803/+437
| | | | | | | | This change allows a video to be played repeatedly. It also introduces an extension framework. Change-Id: I5566192f138c1f0fd889b85496dd27fbf2aed10d CRs-Fixed: 507973
* Gallery2: support loop/single video play modeLikai Ding2014-11-0419-0/+1216
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I0f55dfdfe812262804e7e45c99c7c9bbc5fb7503
* Gallery2: support audio effects during video play.Likai Ding2014-11-0414-1/+767
| | | | | | | | | | Porting from kk with fixes Conflicts: res/values/strings.xml Change-Id: I267c3c7e402fd5cf2bb223547003af491dd8289e Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* Gallery2: support GIF animationLikai Ding2014-11-0412-1053/+957
| | | | | | | This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* Gallery2: support GIF animationLikai Ding2014-11-046-0/+1173
| | | | | | | | (cherry picked new files from commit 2b133c9747af26701a12d60caef3e7e14cf55536) Change-Id: I227cef76cbacd66b7e87bc59b4f07d518b70a859 Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* Gallery2: Support HSCI screencolor settings useshibom2014-11-041-7/+31
| | | | | | | Support to change HSCI values of the picture from Gallery2 in screencolor settings, and set a picture as screen color. Change-Id: If45adfca632083f297a58f3431ce9177bd4433c4
* Gallery2: avoid the crash of gallery during trimming videostaging/cm-12.0-cafLi Sun2014-11-042-0/+25
| | | | | | | | | | - Google only provides the lib of mp4 parser to support the video-trim feature. But some files would fail to trim and cause the gallery crash - catch the IllegalStateException to avoid the crash of gallery Change-Id: Iadda7a42d4d694c102d50d2c52a93979ba2907a7 CRs-Fixed: 523986
* Fixed NullPointerException when EXIF data is invalidUday Kiran jandhyala2014-11-043-1/+7
| | | | | | | For some images with no / invalid EXIF data, Gallery crashes Fixed this bug by catching NullPointerException Change-Id: I656fe6d526c981933c3d6eeefe67cda860206e2d
* Handle exception thrown for invalid track formatsLeena Winterrowd2014-11-041-5/+10
| | | | | | | | MediaMuxer's addTrack() function can throw IllegalArgumentException if the track added is invalid or not supported. Catch this exception to out nicely and avoid an app crash. Change-Id: Id837179c56878dd7fef96d3b798bf427d82d7175
* Use WeakReferenes to reduce Bitmap memory footprintUday Kiran jandhyala2014-11-041-3/+4
| | | | | | | | | | | Use HashMap<Integer, WeakReference<Drawable>> instead of just HashMap<Integer, Drawable> Without this, references are still being held for Bitmap drawables, thereby after few Photo edits, OutOfMemoryException is raised and Gallery crashes Change-Id: If91f950986bd816d5571a0d51a7cb9522226e270
* Gallery2: Fix crash for unsupported format on mute operationVasantha Balla2014-11-042-0/+40
| | | | | | | | | | MPEG4Writer does not support formats other than mp4/h264/h263. The app needs to check for unsupported formats before starting any mute operation. Add a condition in the app to check for unsupported formats and display a toast message. CRs-Fixed: 514347 696137 Change-Id: Ib2ce48d2b8ebaef80936bc7a446e1c97e3a10c31
* Gallery2: add support for the DASH mimetypeRob Walker2014-11-041-0/+1
| | | | | | | Add support for the DASH mimetype CRs-Fixed: 539815 Change-Id: Ibbd03a2e4e3b1ca9224d4651e1c518e2ba51ba77
* Import translations. DO NOT MERGEBaligh Uddin2014-10-192-2/+2
| | | | | Change-Id: Ief34f14f74bc2279df96949963e645fda66db3c2 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-09-291-4/+4
| | | | | Change-Id: Ic83a00633f552a2ea93548df4fde12de35208561 Auto-generated-cl: translation import
* Bring Gallery2 manifest into parity with CROP supportAlan Newberger2014-09-171-3/+0
| | | | | | | | | | | Gallery2 does not support http/https CROPping, so remove them from manifest. Tested app on device and confirmed Gallery2 is still successfully a CROP app for content URIs after this modification. Bug: 15919429 Change-Id: Ib0dacdbf3013d8a2f35a07a8ea0e15070ebdb2e7
* Import translations. DO NOT MERGEBaligh Uddin2014-09-144-5/+5
| | | | | Change-Id: I87b6823da1c4640b360b972d0e9f1b253c765d97 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-08-242-3/+3
| | | | | Change-Id: Id9696cb380f800ac00230f2a3a61045dcc7d295b Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-163-3/+3
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-08-163-3/+3
| | | | | | | | | | Change-Id: I69986cc4a1cfbbaceb19c2f49b3da5535c5ffa53 Auto-generated-cl: translation import
* | am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-160-0/+0
|\ \ | |/ |/| | | | | * commit '385d27f97bc9cf0b35c7e847153d7f1a6968c5e9': Import translations. DO NOT MERGE
| * am 9c33ce0b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-150-0/+0
| |\ | | | | | | | | | | | | * commit '9c33ce0b25b8db02c1719b1c38c05b4246e417a8': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I5d489ead8260bc3c1459566eb3587479a50a23f3 Auto-generated-cl: translation import
* | | Start new task for Gallery trampolinesAlan Newberger2014-08-082-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing the Camera trampoline, even in the full gallery app from a JB to K upgrade, I noticed that the Camera app was starting in the Gallery trampoline's task -- two recents even with excludeFromRecents true. Was still the case in the new trampoline. Adding FLAG_ACTIVITY_NEW_TASK addressed this, also with some manifest changes in the trampoline in another CL. Photos was working, I believe because photos activities explicitly set a task affinity to shield themselves from G+, thus forcing a new task. Also, this helped shield activities when both trampolines are active. That is, if Camera was started via its trampoline, then Photos, the Photos shortcut opened Camera because it already had an activity in the trampoline's task. Even if Photos works now, this does no harm and ensures we're not relying on the implementation of another APK. Bug: 16843573 Change-Id: Ifa6d65ef2b00a4ffc6df78f13dba16270113509d
* | | Build against the NDK libraries.Ying Wang2014-07-223-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | That way you don't have dependency on the platform libraries, which in turn depends on things like libcompiler_rt-extras, which isn't exposed to apps_only build. Bug: 16398512 Change-Id: Ie7cf54c97c57b13e82c1891970eb3731a68ae075
* | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1915-3748/+0
| | | | | | | | | | | | Change-Id: I31af0be894572dd5d2862bf58840f76ba8b8e802
* | | Call setLocalMatrix before setShader. do not mergeLeon Scroggins III2014-07-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that setLocalMatrix does not modify associated Paints, we need to call it before assigning the Shader to the Paint. BUG:14315916 Change-Id: I6778a35eff36515e18c53a979dd69d8aecd1401d (cherry picked from commit ce3b2ee2c6512a0eac9dbd54641a196baa68ba3f)
* | | am 35d4b725: (-s ours) am 30d0576f: (-s ours) am 3fa82573: (-s ours) am ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | 8fe98c70: (-s ours) Import translations. DO NOT MERGE * commit '35d4b725b3c87db9583248cd63a6f6ffa6deeff7': Import translations. DO NOT MERGE
| * | am 30d0576f: (-s ours) am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '30d0576f2a60b3a82cfeed6778dc60d763bfb654': Import translations. DO NOT MERGE
| | * am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '3fa825732965bf71301fbf722c6388168d1df11e': Import translations. DO NOT MERGE
| | | * am 8fe98c70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '8fe98c70253824cda07243e27f261e0b21ccb229': Import translations. DO NOT MERGE
| | | | * Import translations. DO NOT MERGEBaligh Uddin2014-07-067-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbbf8e0d7d2bdefd53ee28b487f311a6111ec7c0 Auto-generated-cl: translation import
* | | | | am 6316f5ff: (-s ours) am 8d2d3d46: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6316f5ff2a8c3de69e6580c9220809242683f0c1': Import translations. DO NOT MERGE
| * | | | am 8d2d3d46: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '8d2d3d462f47c00c9520589f6b4755299fe3b1d9': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c29d576ca2394a44f4a7aaa64ebff49b29568eb Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-068-0/+1248
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie48361f103c0b692aa8812a667b057a253f11cef Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-3017-4/+2344
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia714e01ecbad734c76ba3b7fd75d086a46976c1d Auto-generated-cl: translation import
* | | | | am 2f471180: (-s ours) am 612e3bb4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-06-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2f471180def1d5bc05dae9db7fb8aaae495c1b60': Import translations. DO NOT MERGE
| * | | | am 612e3bb4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-06-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '612e3bb4f83bd704fea44699dfa0f1c92a90efe4': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bc970fb19fdcc612d48441d5221d70071600800 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ce56274445ceb1b575bf1b0965bf499765b62af Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29ceba60e7f79676cc54bc6605112df43f848c79 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89a9eb98a9b3f0daa1cc4ac89c15da960963c7cc Auto-generated-cl: translation import