summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Fix undo button enable conditionkaiyiz2014-11-301-1/+1
| | | | | | | | | | | | When jump into interface of Image edit, the undo button is enable at first, for the judgement of canUndo is set true, but actually there is nothing to undo. Change canUndo's judging condition. CRs-Fixed: 759431 Change-Id: Idae9feaca62b5cdc67610cf332c2b65f1692dbb4
* Gallery2: fix app crash when there is no map appkaiyiz2014-11-281-3/+18
| | | | | | | | | | | ActivityNotFoundException happened after click showOnMap menu when there is no map app. Catch the Exception to avoid app crash. CRs-Fixed: 753928 Change-Id: I7d811e4a636bed22935fcc050d97559ace44eb31
* Merge "Gallery2: Set default value for server timeout"Linux Build Service Account2014-11-201-0/+5
|\
| * Gallery2: Set default value for server timeoutkaiyiz2014-11-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | The timeout of server is not set when read from flag of SERVER_TIMEOUT, the value will stay to be -1, as a result there will be no resume dialog Set a default value of 3 min for resume timeout CRs-Fixed: 753834 Change-Id: Icd4640c4b56a64857dfade1bb8d7a3581494d404
* | Gallery2: Displayed titles in ActionBar during video playbackkaiyiz2014-11-201-2/+2
|/ | | | | | | | | | There is no displayed titles in ActionBar during video playback Add the ActionBar Flag to displayed titles in ActionBar during video playback CRs-Fixed: 758779 Change-Id: I24da392c0dd64b8f1c520bfe75c90f38088c612a
* Gallery2: don't pause background music perminentlywjiang2014-11-131-12/+0
| | | | | | | | | Gallery app requests transient audio focus twice and explicitly pauses background music playback. To allow music resume after movie playback exists, remove redundant audio focus request and pause broadcast. CRs-Fixed: 695669 Change-Id: I46b88defc887d3e5b5c97acdc4f5a0a11d486a76
* Gallery2: The settings in the gallery is blank.kaiyiz2014-11-041-2/+2
| | | | | | | | | | The settings' activity is blank. The settings is added by Google, maybe there is some functions later. So just take is as annotation. Change-Id: I2c738def95b2ce08c679f83d9d8e26130b503ada CRs-Fixed: 745988
* Gallery2: Make forward/rewind button grey when stopVideokaiyiz2014-11-041-1/+0
| | | | | | | | | | | | StopVideo Api is setting the view visibility which causes the surface to be created and make the bug happen. Removed the functionality of the view visibility in stopVideo Api CRs-fixed: 642082 Change-Id: I4305302e52ec647bc2b935a817e77a173647be22
* Gallery2: Fix the border name display abnormallykaiyiz2014-11-041-12/+3
| | | | | | | | | The border name display abnormally Make the border name display normally Change-Id: Id237236830a272abd958e033315b0e70eff6ff38 CRs-fixed: 740974
* Gallery2: fix time text display issueLikai Ding2014-11-041-0/+1
| | | | | | | | | In TrimTimeBar, mTimeBounds may never get updated, which causes time text to be out of screen. Give mTimeBounds a reasonable intial value to prevent this. Change-Id: Ie0378acde5b856340ac0dccdc0a688438b7827e0 CRs-Fixed: 627787
* Gallery2: fix can not add gallery widget to home screenkaiyiz2014-11-041-1/+1
| | | | | | | | | | | | | When selected to add a cropped picture to home screen, the binder transaction failed because it was too large, add widget failed. We reduce the allowed maximum bitmap size in intent, to make sure that binder size will not greater than 1M. CRs-Fixed: 528927 Change-Id: Id63c8503dead66ab18531a78b0b4206d1fd30d07
* Gallery2: Make icon display completely.kaiyiz2014-11-041-1/+1
| | | | | | | | | | The icon size is to big for the device screen. Adjust the icon size to the right width. CRs-fixed: 639562 Change-Id: Ibde082d48d4f12009f5293de049798cf221adda4
* Gallery2: Cropped video seek bar pointer.kaiyiz2014-11-041-1/+1
| | | | | | | Modify time bar layout to make it show completely. Change-Id: Id3c61db55e2c92696babe38bf9cc8f94c32459ce CRs-Fixed: 737809
* Gallery2: Reginal requirement for RTLkaiyiz2014-11-0412-60/+443
| | | | | | | | Add RTL logic in load picture, pick picture, show picture, delete picture, load album, pick album, show album, show widget, pick widget, scroll timebar. Change Camera setting to support RTL. Change-Id: Ica264f624e0f20153280066264943882ad22f2db
* Gallery2: Fix Gallery crash when exit playing gif pic.kaiyiz2014-11-041-0/+3
| | | | | | | | | | | When we press back key to exit playing gif pic,the decoder is free and set to null,which casuse this bug happened. Add a condition to avoid the NullPointerException. CRs-fixed: 653709 Change-Id: Iab299554c252c3a1c9352b498cd946cb53e47cc7
* Gallery2: Fix the original picture not display after edit.kaiyiz2014-11-041-4/+4
| | | | | | | | | Not move the origianl picture to auxiliary directory and insert the edited picture record to the database. CRs-fixed: 714431 Change-Id: I5b8fce7b24cc812463282d114094356707c2096c
* Gallery2: Fix batches of issues in movie effectswjiang2014-11-042-35/+57
| | | | | | | | | | | | | | | | | | | | 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-041-0/+14
| | | | | | - Support user link to net to see more images. Change-Id: I4c095bd124057c996d4bf0d3a4a035b6587db640
* Gallery2: add some video featuresLikai Ding2014-11-047-86/+1466
| | | | | | | including: previous/next video play mode, screen mode, fast forward/rewind button, step settings. Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e
* Gallery2: support live streaming and bookmarksLikai Ding2014-11-044-59/+959
| | | | | | | Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
* Gallery2: support stereo/single track play modeLikai Ding2014-11-041-0/+7
| | | | | | User can select stereo/single track play mode. Change-Id: I8225739815484f3c288823802f68478cb457725e
* Gallery2: support loop/single video play modeLikai Ding2014-11-042-15/+149
| | | | | | | | This change allows a video to be played repeatedly. It also introduces an extension framework. Change-Id: I5566192f138c1f0fd889b85496dd27fbf2aed10d CRs-Fixed: 507973
* Gallery2: support audio effects during video play.Likai Ding2014-11-043-0/+579
| | | | | | | | | | 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-0410-1011/+934
| | | | | | | This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* Gallery2: support GIF animationLikai Ding2014-11-045-0/+1127
| | | | | | | | (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-041-0/+22
| | | | | | | | | | - 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-042-0/+6
| | | | | | | 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-041-0/+37
| | | | | | | | | | 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
* 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
* 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)
* Update ingest importer codeBobby Georgescu2014-05-1422-2292/+2922
| | | | Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f
* am 3d736418: Merge "Use basic editor for sharpen filter."Alan Newberger2014-04-221-1/+2
|\ | | | | | | | | * commit '3d73641843682089be63cd248465497f007b93a1': Use basic editor for sharpen filter.
| * Use basic editor for sharpen filter.Jun Su2014-02-231-1/+2
| | | | | | | | | | | | | | | | | | Currently gallery's sharpen filter is relate to the editor id = R.id.imageShow, which is not point to any valid editor. As a result native gallery sharpen function will cause exception and fail. Change to use basic editor. Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be
* | am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"Nick Kralevich2014-02-011-1/+1
|\| | | | | | | | | * commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c': gallery: change typo '&&' to '||'
| * gallery: change typo '&&' to '||'Leavitt Zhang2014-01-281-1/+1
| | | | | | | | | | | | | | | | | | Assertion to ckeck array boundary should be '&&' instead of '||'. It caused an Exception that '-1' wasn't detected. Change-Id: I991ad8efed87a0837d262fe7419c7f007c173b56 Signed-off-by: Leavitt Zhang <leavittz@nvidia.com>
* | am 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
|\ \ | |/ |/| | | | | * commit '91628475ee8409e03f57a038c0bec3a830f462d6': Fix the thumbnail generation.
| * Fix the thumbnail generation.ztenghui2013-11-181-0/+3
| | | | | | | | | | bug:11664501 Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
* | am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-041-1/+1
|\| | | | | | | | | * commit '350f7e3de777fdb331494ea5efb08809e46f980b': Fix infinite spinner dialog
| * Fix infinite spinner dialognicolasroard2013-11-011-1/+1
| | | | | | | | | | | | bug:11328106 Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd
* | am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if ↵nicolasroard2013-11-042-0/+8
|\| | | | | | | | | | | | | tiny planet is here" into gb-ub-photos-carlsbad * commit 'c23e8d862de72682f444f68fff3b1f30efcc21cd': Disable geometry button if tiny planet is here
| * Merge "Disable geometry button if tiny planet is here" into ↵nicolasroard2013-11-022-0/+8
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Disable geometry button if tiny planet is herenicolasroard2013-11-012-0/+8
| | | | | | | | | | | | | | | bug:11288853 Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
* | | am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" ↵John Hoford2013-11-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff': fix Gallery crash using crop
| * | fix Gallery crash using cropJohn Hoford2013-11-011-0/+1
| |/ | | | | | | | | bug:11347083 Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
* | am 2c237f11: Merge "Fix invalid private access."Narayan Kamath2013-10-311-2/+2
|\ \ | |/ |/| | | | | * commit '2c237f1146ebc4385a9a0a0c6f9365aa09db5b24': Fix invalid private access.
| * Fix invalid private access.Narayan Kamath2013-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | See http://bugs.sun.com/view_bug.do?bug_id=6904536 bug: 8992787 (cherry picked from ff19ed981400cd150f8779107cba1e02033b9ebe) Change-Id: I7cad5e9cf8761b440cf91b96e3599d19bc3188d9
| * am ee14cce0: am e8e2610f: Fix preview thumb and touch target out of syncDoris Liu2013-07-102-2/+17
| |\ | | | | | | | | | | | | * commit 'ee14cce054c74c3eb785de3ea4936c75bb753b6b': Fix preview thumb and touch target out of sync