summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Remove the 'Make available offline'kaiyiz2015-03-201-0/+1
| | | | | | | | | The 'Make available offline' is not availiable Remove this item in menu Change-Id: Ia4e79b48b321c09ffefa30c7d12ee6bbec9094bd CRs-Fixed: 810360
* Merge "Modify:Gallery2 for branch Gallery2"Linux Build Service Account2015-03-195-1/+32
|\
| * Modify:Gallery2 for branch Gallery2Zhang Zhenzhen2015-03-185-1/+32
| | | | | | | | | | | | | | Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
* | Gallery2: Add "No faces" stringsmqi2015-03-164-0/+7
|/ | | | | | | | | | Gallery shows "Untagged" when grouping pictures by faces if no faces were tagged. Change "Untagged" to "No faces". Change-Id: I7cde7a26e7340bdd95706d34480d8e8f61683138 CRs-Fixed: 807429
* Gallery2: Gallery2 resources for beautification featureByunghun Jeon2015-03-1216-0/+0
| | | | Change-Id: I2da57ec1bf807d89494abd84b5bb7a7f3a9f5e51
* Merge commit into AOSP_MERGENatiq Ahmed2015-03-105-11/+11
|\ | | | | | | Change-Id: I8bb85ff15acbfc70701d259f1761715a2041aa74
* | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-206-0/+15
| | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* | Merge "Gallery2: Fix force close issue when trim video"Linux Build Service Account2015-01-121-0/+1
|\ \
| * | Gallery2: Fix force close issue when trim videoxiaoqiny2014-12-251-0/+1
| | | | | | | | | | | | | | | | | | | | | - Only mp4 and 3gp file support trim function Change-Id: I6e254ca6d5445d62b0276695667f4bdb07f9a59c CRs-Fixed: 652838
* | | Gallery2: fix app crash when there is no map appkaiyiz2014-11-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Gallery2: Fix photo widget display black when no picutures.kaiyiz2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The color of "No photos" is same with its background which make the text of "No photos" not display. Modify the color of text to make "No pictures" display CRs-Fixed: 752380 Change-Id: Iba4ea3085528199faddb39f55e7383f910440526
* | | Gallery2: Add audio output switcher between headset/speakerkaiyiz2014-11-042-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no audio output switcher between headset/speaker. Add the audio output switcher button to menu list in order to let user use this function. CRs-Fixed: 650867 Change-Id: I16f5fdc74a76ee55557ba87b0145e51165f0408a
* | | Gallery2: Prompt inf does not translate to Chinese.kaiyiz2014-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The string headset_plug does not have Chinese translation. Add Chinese translation for string headset_plug. Change-Id: I95d4f9c8836861615963060064a91c4c4e33db54 CRs-Fixed: 744825
* | | 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: Fix the border name display abnormallykaiyiz2014-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The border name display abnormally Make the border name display normally Change-Id: Id237236830a272abd958e033315b0e70eff6ff38 CRs-fixed: 740974
* | | 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: Reginal requirement for RTLkaiyiz2014-11-0451-226/+226
| | | | | | | | | | | | | | | | | | Convert left/right layout properties to start/end properties. Change-Id: Icaa0388cafbf1133fb37933f0ca1452d8d20968b
* | | Gallery2: Fix batches of issues in movie effectswjiang2014-11-048-17/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-043-3/+20
| | | | | | | | | | | | | | | | | | - Support user link to net to see more images. Change-Id: I4c095bd124057c996d4bf0d3a4a035b6587db640
* | | Gallery2: add some video featuresLikai Ding2014-11-0454-42/+47
| | | | | | | | | | | | | | | | | | | | | including: previous/next video play mode, screen mode, fast forward/rewind button, step settings. Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e
* | | Gallery2: add some video featuresLikai Ding2014-11-0449-0/+158
| | | | | | | | | | | | | | | | | | | | | (cherry picked files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Ifdcc4e9ab14d1f8b273faa97f0f66ba2f4034bea
* | | Gallery2: support live streaming and bookmarksLikai Ding2014-11-0412-105/+271
| | | | | | | | | | | | | | | | | | | | | Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
* | | Gallery2: support live streaming and bookmarksLikai Ding2014-11-047-0/+169
| | | | | | | | | | | | | | | | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Idc254cf0f7e8a9b492203313fa63349d07d19d5c
* | | Gallery2: support stereo/single track play modeLikai Ding2014-11-044-0/+7
| | | | | | | | | | | | | | | | | | User can select stereo/single track play mode. Change-Id: I8225739815484f3c288823802f68478cb457725e
* | | Gallery2: support stereo/single track play modeLikai Ding2014-11-042-0/+0
| | | | | | | | | | | | | | | | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I2d7d523ca586a031c3fb139eda321d5073b30589
* | | Gallery2: support loop/single video play modeLikai Ding2014-11-0413-380/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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-049-0/+380
| | | | | | | | | | | | | | | | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I0f55dfdfe812262804e7e45c99c7c9bbc5fb7503
* | | Gallery2: support audio effects during video play.Likai Ding2014-11-0411-1/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-42/+13
| | | | | | | | | | | | | | | | | | | | | This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* | | Gallery2: support GIF animationLikai Ding2014-11-041-0/+46
|/ / | | | | | | | | | | | | | | (cherry picked new files from commit 2b133c9747af26701a12d60caef3e7e14cf55536) Change-Id: I227cef76cbacd66b7e87bc59b4f07d518b70a859 Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* | Gallery2: avoid the crash of gallery during trimming videostaging/cm-12.0-cafLi Sun2014-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | - 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
* | Gallery2: Fix crash for unsupported format on mute operationVasantha Balla2014-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | 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
* | 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
* | 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
* Import translations. DO NOT MERGEBaligh Uddin2014-08-163-3/+3
| | | | | Change-Id: I69986cc4a1cfbbaceb19c2f49b3da5535c5ffa53 Auto-generated-cl: translation import
* Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1915-3748/+0
| | | | Change-Id: I31af0be894572dd5d2862bf58840f76ba8b8e802
* 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
* 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
* Import translations. DO NOT MERGEBaligh Uddin2014-06-091-1/+1
| | | | | Change-Id: Ica62f7063acf0dc219d44297d39a5cc8cfa7c6c8 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-041-1/+1
| | | | | Change-Id: I0244de878b8cbd98ea17a1ab728f3aaad77cc764 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-021-1/+1
| | | | | Change-Id: I899486c9290301037257c68e1d9b502ce37e63d9 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-05-281-1/+1
| | | | | Change-Id: I2204346439e2103f23a6db47c4787822dcbc2b9b Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-05-261-1/+1
| | | | | Change-Id: I9fb16f79289782aeaa6e39a82aa0b79e39ddc87b Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-05-201-1/+1
| | | | | Change-Id: Id141df28e0c2994195e170a1ec47784fe2791b61 Auto-generated-cl: translation import
* Update ingest importer codeBobby Georgescu2014-05-147-9/+32
| | | | Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f