summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0Brint E. Kriebel2014-12-2310-0/+239
|\
| * Automatic translation importMichael Bestas2014-12-205-0/+85
| | | | | | | | Change-Id: I49f70d8488268f3face755b75b9c64c07d666a65
| * Automatic translation importMichael Bestas2014-11-276-0/+154
| | | | | | | | Change-Id: I84d831c15b8fa4236d67123338b42d7a939a7b9f
* | Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0Brint E. Kriebel2014-11-180-0/+0
|\|
| * Automatic translation importMichael Bestas2014-11-1012-2/+309
| | | | | | | | Change-Id: Id1733ae77547193abaf83fdf9e7583a6f47bb029
* | Automatic translation importMichael Bestas2014-11-1012-2/+309
| | | | | | | | | | Change-Id: Id1733ae77547193abaf83fdf9e7583a6f47bb029 (cherry picked from commit 642383e27e0b9879c04c945812c55d7edcf5ec3d)
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-11-0344-51/+1715
|\| | | | | | | | | | | | | | | | | Conflicts: res/values-de/codeaurora_strings.xml res/values-fr/codeaurora_strings.xml res/values-lt/codeaurora_strings.xml Change-Id: I0e79eeb4bd48a9ba9d36f8fe4fa17651822d442b
| * Automatic translation importMichael Bestas2014-10-2728-1/+582
| | | | | | | | Change-Id: I0ddc7056801caa294cb8d5e9a7328153cbb90452
| * Add record time to details viewFlamefire2014-10-216-28/+67
| | | | | | | | | | | | | | | | PS2: Move strings PS3: Move DateTime format to public in ExifInterface PS4: Actually use that DateTime format Change-Id: If30e19d0b79039357f393752544c655e073a46d2
| * Automatic translation importMichael Bestas2014-10-214-1/+192
| | | | | | | | Change-Id: I4ff48d04ec68453e8ff12850d6cec9608ffa9d50
| * Automatic translation importMichael Bestas2014-10-1512-22/+875
| | | | | | | | Change-Id: I7793d0aea58141d3007f5c2c33d43070f0507e4a
| * Automatic translation importMichael Bestas2014-10-0428-29/+108
| | | | | | | | Change-Id: I989133f4c33c427e6dee610043aaeb3fc4e00356
* | Automatic translation importMichael Bestas2014-10-0528-29/+108
|/ | | | | Change-Id: I989133f4c33c427e6dee610043aaeb3fc4e00356 (cherry picked from commit 848fe71bb57ef1fb347e8c49dcc59990404d5ffe)
* Gallery2: Set untranslatableMichael Bestas2014-09-301-1/+1
| | | | Change-Id: I2a8209a0a8bee15e637a690ed4aca92dba686f3c
* Automatic translation importMichael Bestas2014-09-3069-963/+1990
| | | | Change-Id: Ic4030f61b45e1d64b53bae00b66f35a48b35a217
* Gallery2: Remove unused stringsMichael Bestas2014-09-241-3/+0
| | | | Change-Id: Ib9638dd20aa0ba249152f7fe55d54c2e16b11807
* Merge "Fix crash of gallery on showing details" into cm-11.0Danny Baumann2014-09-181-10/+23
|\
| * Fix crash of gallery on showing detailsFlamefire2014-09-181-10/+23
| | | | | | | | | | | | | | | | The exif parser adds a terminating zero for string values. This increases the byte count for that entry beyond the set byte count. Causing a null value in e.g. the "Model" field for images taken with e.g. a Samsung Wave 2. Change-Id: Ifb6ee4d5b4b71e84cb2a5df459d3716543e25efe
* | Merge "Reduce logspam in video player" into cm-11.0emancebo2014-09-1719-51/+103
|\ \
| * | Reduce logspam in video playeremancebo2014-09-1619-51/+103
| |/ | | | | | | Change-Id: I71b1356f7e326174378c99b4b0e5e60764a7c139
* / Gallery2: Improve stringsMichael Bestas2014-09-172-19/+19
|/ | | | Change-Id: I412575218eec402b194cb8b51b7bee6d2e353b79
* Automatic translation importMichael Bestas2014-09-132-1/+4
| | | | Change-Id: I3a7801da056a2432f40bdd3326813b0f667fcbde
* Gallery2: Move CAF stringsMichael Bestas2014-09-102-22/+22
| | | | Change-Id: I04adc709f0828be535a008b0914270d5bb903bdc
* Gallery2: Seek to trim start time only once when playinglubiny2014-09-041-1/+4
| | | | | | | | | | | - When playing video in TrimVideo activity, it may enter an endless loop: Seek to trim start time (actually sought to previous sync frame) -> Periodic check, if current position < trim startm, seek again. - This patch adds a flag to ensure seeking to trim start time only once. Change-Id: I3cd74fbd85546cc35d5c32797ab7f1775f091586 CRs-Fixed: 694431
* Gallery2: don't pause background music perminentlywjiang2014-09-042-17/+1
| | | | | | | | | 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: Fix menu bar layout display error in portrait modekaiyiz2014-09-041-1/+1
| | | | | | | | | | The forward button is interlock with separate line. Modify layout param to make the layout display normal. CRs-fixed: 674514 Change-Id: Idf09aee09c67ad943109ad054fe8d4bfa41e4061
* Use WeakReferenes to reduce Bitmap memory footprintUday Kiran jandhyala2014-09-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 Conflicts: src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java Change-Id: If91f950986bd816d5571a0d51a7cb9522226e270
* MoviePlayer: don't resume playing if there is pending dialogLikai Ding2014-09-041-4/+4
| | | | | | In onResume(), mDelayVideoRunnable should be posted after dialog check. Change-Id: I3b7789090acb1a49803a66766883414768b59ac7
* MoviePlayer: don't pause after leaving for a long timeLikai Ding2014-09-041-31/+1
| | | | | | | | Currently, after leaving video player for more than 3 minutes, the video will be paused upon returning. Remove this behavior as it's not required for non-streaming videos. Change-Id: Ibe58bcc35bb3c3c95198447978d180fbd54e7b12
* Gallery2: Fix menu display inconsistent with its clusterkaiyiz2014-09-041-7/+7
| | | | | | | | | | | | | | The operation order is not correct.We should first execute the change of cluster,then display menu title according to the cluster.But we do the opposite operation,which cause the menu will always display last cluster‘s corresponding menu and cause this bug happened. Modify the operation order. CRs-fixed: 619812 Change-Id: I6cd3c82e065cef5a463e06295bf332e1459500e3
* Gallery2: Add audio output switcher between headset/speakerkaiyiz2014-09-045-2/+268
| | | | | | | | | | | 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: Fix Gallery crash when exit playing gif pic.kaiyiz2014-09-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 force close issue when trim videoxiaoqiny2014-09-042-2/+10
| | | | | | | - Only mp4 and 3gp file support trim function CRs-Fixed: 652838 Change-Id: Ib265b96925b84fab458800fea9901ea928c411bb
* Gallery2: Fix Gallery2 ANR when run monkeykaiyiz2014-09-041-2/+4
| | | | | | | | | | | | | When we create ExportDialog View,a null pointer is used to reset mOriginalBounds which cause this bug happened. Add a condition when judge conditon is null,then not to reset mOriginalBounds to avoid this bug. CRs-fixed: 647207 Change-Id: If91434c3ca15a287600097b7a5ec8c5aa7d7d6e2
* MoviePlayer: add default server timeoutLikai Ding2014-09-041-0/+4
| | | | | | | | | The patch provides a default server timeout, in case of server not supplying the value or lacking low-level support, for better carrier requirements compliance. Change-Id: I5ad83ed5bcea814405e54b8d75d9612d607a3973 CRs-Fixed: 638087
* Gallery2: Fix cropped picture cannot be saved.kayiz2014-09-041-12/+11
| | | | | | | | | | | | | | When click the saveButton to save the cropped picture, We found the source picture uri and the cropped picture uri are the same,which cause the cropped picture can not be saved. Closed file Stream of mInStream before re-open it for the same file. CRs-Fixed: 622666 Change-Id: Ifcaa39ea76c141021259fad891411c59f7587903
* Gallery2: Fix force close issue when mute some videosxiaoqiny2014-09-041-3/+12
| | | | | | | - only support mp4 and 3gp format Change-Id: I748569864565dd5580784ec8b0214f3f3e253415 CRs-Fixed: 642145
* Gallery2: avoid black screen when MovieActivity endsliangche2014-09-041-0/+1
| | | | | | | Set player status in MovieActivity when play completes, in order to avoid hiding VideoView when MovieActivity pauses. Change-Id: Ia1eedbec7a01ccac69a3355f47fd0a91d039d8b4
* Gallery2: Make forward/rewind button grey when stopVideokaiyiz2014-09-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
* MoviePlayer: add default server timeoutLikai Ding2014-09-041-0/+3
| | | | | | | | | The patch provides a default server timeout, in case of server not supplying the value or lacking low-level support, for better carrier requirements compliance. Change-Id: I4b32478823f0e0226aac3098e4ac7e7ea064a73c CRs-Fixed: 638087
* Gallery: add an activity to set system properties for streamingkaiyiz2014-09-043-4/+130
| | | | | | | | | | App forgets add an activity to set system properties for streaming. add an activity to set system properties for streaming. CRs-Fixed: 635639 Change-Id: Idba31bd7a7489a01b5cc061fffb4ebcc7af3f813
* Gallery2: Make icon display completely.kaiyiz2014-09-042-2/+2
| | | | | | | | | | 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: add mkv and divx mimetypeslubiny2014-09-041-0/+2
| | | | | | | - Add extra mimetypes so they can be used for streaming Change-Id: I1df1b011ee54b646f23cfe3faa206c0aac41a838 CRs-Fixed: 620381
* MoviePlayer: prevent resume dialog for live streamingkaiyiz2014-09-041-3/+10
| | | | | | | | | | The player should not offer "resume playing" dialog for live streaming when user navigates back to it. (cherry picked from commit 3a16d7f019fc77c54ce38a137507ba5e5ac1ae8b) Change-Id: I7fe6727ab884056a9135d1fa5ab21125570f70a3 CRs-Fixed: 637212
* MoviePlayer: fix background issue when loading a videokaiyiz2014-09-041-1/+3
| | | | | | | | | | | | The video's width and height may be set to 0 when it's prepared, which makes the player treat it as an audio file, and set the music icon as background. Do not set the bottom panel if the player is not in playback state. (cherry picked from commit a6facd923d07a66afa71e6cefa32ec8fc95bdb7b) Change-Id: I7c2e3caf54b11b439419c22d9adb4e5eb205c706
* MoviePlayer: fix a crashLikai Ding2014-09-041-1/+1
| | | | | | Fix possible NullPointerException in setActionBarTitle(). Change-Id: Ie5fdb1c60e9db147c1a06534d2c2dbbbe64a5edb
* Gallery2: Fix gallery crash when view gif pic in Mmskaiyiz2014-09-041-1/+2
| | | | | | | | | | | | When use data uri of file from fileExplorer to view gif picture, the activity can not be found. Add type to the intent of ViewGifActivity to make the Activity can be found successfully. CRs-fixed: 636457 Change-Id: I123c3551dc394d099e03713cd415ed008b716453
* Gallery2-Add Presentation judgement in State Equelkaiyiz2014-09-041-1/+6
| | | | | | | | | | In filtershow state equel judgement, there is only one condition of Filter Class There should be another three conditions of FilterFxRepresentation, FilterImageBorderRepresentation and FilterColorBorderRepresentation CRs-fixed: 624591 Change-Id: I19f93d7bbaeb69048698c804eb50712581d87fd1
* Gallery2: Make picture in selected status when back from homepagekaiyiz2014-09-041-3/+0
| | | | | | | | | | | | When selected picture and go to homepage,the Gallery will leave selection mode, so when back to the gallery ,the picture become unselected status. Do not leave selection mode when exit the gallery page. CRs-Fixed: 630782 Change-Id: I8090c65ba39be28f9914735ee96b781068cfa3cf
* Gallery2: fix FC when try to open video folder as MMS attachment.kaiyiz2014-09-041-2/+2
| | | | | | | | | | | | | If there are too many videos in the folder, it will takes some time to check if all the items are videos, then the application may not responding. If it is get content from other apps, it do not display option menu, no need to check all items. CRs-Fixed: 581769 Change-Id: Ie59830c8756e3a2ece7fcaa526d8f09212b20d6f
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 07:06:52 +0000