summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: fix photo widget has not sync after delete the photo.Chao Zhang2016-04-142-0/+89
| | | | | | | | Use a ContentObserver to observe uri's change. If uri is deleted, show a empty view in widght. Change-Id: I11f0632ed96958a74b6aa2cdd9c2f1d88c99e94e CRs-Fixed: 981663
* Gallery2: Remove some menu items in editor interface.wqi2016-04-123-23/+1
| | | | | | | | | Remove information, print menu items and change content of reset item to "Back to original" in editor interface according to UX specification document. Change-Id: I1c75be02f388f6796eb9dd947afa9f8103c841f6 CRs-Fixed: 988055
* Merge "Gallery: improve timeline loading performance" into ↵Linux Build Service Account2016-04-121-11/+2
|\ | | | | | | android_ui.lnx.1.2-dev
| * Gallery: improve timeline loading performanceLikai Ding2016-04-111-11/+2
| | | | | | | | | | | | | | | | | | MediaSet's getTotalMediaItemCount() method involves database queries which is slow. The call is not needed in time clustering as the items will be enumerated right after that. Change-Id: I8eaa68237c923486109935180247188da94f397b CRs-Fixed: 984190
* | Merge "Gallery2: fix crash if disable gallery's storage permission in ↵Linux Build Service Account2016-04-121-8/+41
|\ \ | | | | | | | | | settings." into android_ui.lnx.1.2-dev
| * | Gallery2: fix crash if disable gallery's storage permission in settings.Chao Zhang2016-04-071-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GalleryActivity just request WRITE_EXTERNAL_STORAGE permission, so it will occur crash when need READ_EXTERNAL_STORAGE permission; Request both WRITE_EXTERNAL_STORAGE and READ_EXTERNAL_STORAGE permissions in GalleryActivity. Change-Id: I31cf37e231d152cfabaaf2ded0ac0d88f5b9bb8d CRs-Fixed: 997205
* | | Merge "Gallery2: Fix NullPointerException when tap one picture/video" into ↵Linux Build Service Account2016-04-121-9/+15
|\ \ \ | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery2: Fix NullPointerException when tap one picture/videohuiyan2016-04-071-9/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | Catch NullPointerException when the NFC Service dead to avoid crash Change-Id: Icdd88a54e2926e16d0b7de25c9578634bd4b4f28 CRs-Fixed: 982844
* | | Merge "Gallery: improve timeline loading performance" into ↵Linux Build Service Account2016-04-121-15/+7
|\ \ \ | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery: improve timeline loading performanceLikai Ding2016-04-081-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache size in TimeLineDataLoader is unnecessarily large, which prevents top images from being shown. Reduce the cache size as there already is cache in underlying mediaset. Also fixed some minor issues hinted by IDE. Change-Id: Ia0b3259d489d880e53ec35f589efdd6ac36254c8 CRs-Fixed: 984190
* | | | Merge "Gallery: fix timeline page display empty" into android_ui.lnx.1.2-devLinux Build Service Account2016-04-121-10/+4
|\| | | | |/ / |/| |
| * | Gallery: fix timeline page display emptyLikai Ding2016-04-071-10/+4
| |/ | | | | | | | | | | | | | | | | | | | | If timeline page is navigated to again, base MediaSet may be retrieved from cache and its version will not change, causing endless reload() calls. Use isLoading() to determine the state. The regression is caused by I1e05d31632694692025ac78a2d83200281f464ab Change-Id: Icb7d623bc04353bfbca6577d2734d1ef9494d2bc CRs-Fixed: 984190
* | Merge "Gallery2: Fix NullPointerException when scroll pictures in TimeLine." ↵Linux Build Service Account2016-04-071-3/+4
|\ \ | | | | | | | | | into android_ui.lnx.1.2-dev
| * | Gallery2: Fix NullPointerException when scroll pictures in TimeLine.zdi2016-04-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix NullPointerException when scroll pictures in TimeLine with steps: scroll pictures --> slideshow --> backpress. Change-Id: I5d43f8951aeea3bc5dabb306be5366d7db108b39 CRs-Fixed: 980466
* | | Merge "Gallery2: Fix actionbar hide in timeline page." into ↵Linux Build Service Account2016-04-071-0/+3
|\ \ \ | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery2: Fix actionbar hide in timeline page.wqi2016-04-051-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The method of onPhotoChanged may be invoked after onBackPressed when there are a lot of pictures on phone. logout DataListener of mPhotoDataAdapter. keep the onPhotoChanged not invoked after backPressd. Change-Id: I75aada6c29fcdb30d97937bf1e5e2f267f3fb933 CRs-Fixed: 989258
* | | Gallery2: fix display abnormal of photo editor.Chao Zhang2016-04-056-51/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. fix CompareButton's position changed when switch filter. 2. fix editor image's position changed when switch filter. 3. modify exit dialog function. 4. set editor's actionbar not translucent. Change-Id: I5e8445d91a0215d93cf19c7ac44fe98ff2b5fae6 CRs-Fixed: 995996
* | | Gallery2: fix crash in photo editor after change system language.Chao Zhang2016-04-054-6/+30
|/ / | | | | | | | | | | | | | | | | | | revert the judgement of showPanel() in MainPanel.onCreateView() which is removed in change 'I33a031063d8392fecf4de071f62bf46b2aaa57e2'. fix a NullPointerException in AlbumSetPage. Change-Id: I90d88a8b6fdb404213c908961f3615da79b424b0 CRs-Fixed: 995401 995399
* | Merge "Gallery2: Remove some functions of crop model in editor interface." ↵Linux Build Service Account2016-04-052-18/+3
|\ \ | | | | | | | | | into android_ui.lnx.1.2-dev
| * | Gallery2: Remove some functions of crop model in editor interface.wqi2016-03-312-18/+3
| |/ | | | | | | | | | | | | | | Remove some functions of crop only keep crop, straight, rotate in editor interface according to UX specification document. Change-Id: Ice9426f6ccaafe93a3a00bda7c0cd66f215a9209 CRs-Fixed: 988082 997293
* | Merge "Gallery2: Fix crop size changed after rotate phone." into ↵Linux Build Service Account2016-04-051-2/+2
|\ \ | | | | | | | | | android_ui.lnx.1.2-dev
| * | Gallery2: Fix crop size changed after rotate phone.zdi2016-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Set right coordinates for moveCurrentSelection to avoid crop size changed after rotate phone. Change-Id: I8e362da4f09cd4d1ec840d9ad9ea13d8cd80e4df CRs-Fixed: 994922
* | | Merge "Gallery: improve loading performace" into android_ui.lnx.1.2-devLinux Build Service Account2016-04-051-27/+9
|\ \ \
| * | | Gallery: improve loading performaceLikai Ding2016-03-301-27/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert commit I0f09128f8c948a33b72a5b4933efe7f4fbba2cb2 as it does no good but delays page resume call for around 500ms. Change-Id: I7a754467a9353c623bec73bf6d492ed9ba9f28e5 CRs-Fixed: 984190 985483
* | | | Merge "Gallery2: Fix character display abnormal in editor interface." into ↵Linux Build Service Account2016-04-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | Gallery2: Fix character display abnormal in editor interface.wqi2016-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust size of character and change measuring unit to dip ensure the size of character can't change when the model of font size change in setting application. Change-Id: I6019c5a507623c9c2b3daea2ee7d2857ce6efd8a CRs-Fixed: 995404
* | | | | Merge "Gallery2: Adding message in failed case of SeeStraight" into ↵Linux Build Service Account2016-04-052-2/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | | Gallery2: Adding message in failed case of SeeStraightJack Yoo2016-03-282-2/+19
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding restriction checking and show message in case of the failure while processing SeeStraight filter. Change-Id: I691ed701dd261e56a7d5dac44cd6d88bc9b0d1d4 CRs-Fixed: 995402
* | | | | Merge "Gallery2: Fix photo number display abnormal in timeline page." into ↵Linux Build Service Account2016-04-051-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | | Gallery2: Fix photo number display abnormal in timeline page.wqi2016-03-281-0/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The image count of mTimelineTitleMediaItem may not refresh when mKind change to ClusterSource.CLUSTER_ALBUMSET_TIME. Change-Id: I1b286ba52b96524ae053bae363fa306789cab6e1 CRs-Fixed: 993648
* | | | | Merge "Gallery: improve timeline loading performance" into ↵Linux Build Service Account2016-04-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | | Gallery: improve timeline loading performanceLikai Ding2016-03-281-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PAGE_SIZE in LocalMergeAlbum is small, causing many inefficient db queries with a limit clause. Changing it to a reasonably larger value can yield much better performance with little memory impact. Change-Id: I4e8d75a96ab02b8c435956d182320d7721a8814f CRs-Fixed: 984190
* | | | | Merge "Gallery2: Fix the selected picture is not selected after unlock." ↵Linux Build Service Account2016-04-052-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into android_ui.lnx.1.2-dev
| * | | | | Gallery2: Fix the selected picture is not selected after unlock.huiyan2016-03-292-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TimeLinePage leave selection mode when onPause. So the selected picture is not selected when onResume. The TimeLinePage don't leave selection mode when onPause. If page is in selection mode, make toolbar invisible when onResume. Change-Id: Ieecdca955e66d783ada293db2b43039948fc443c CRs-Fixed: 986687
* / | | | Gallery2: fix actionbar display abnormal return from photo edit.Chao Zhang2016-03-292-1/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhotoPage start a new activity state after edit a photo and return in TimeLinePage, Add a judgement to avoid it. Change-Id: Ic0f9cbdcdaa9e5d15cbd55d75423e0d761b8cd89 CRs-Fixed: 981010
* | | | Merge "Gallery2: fix doPrepared() not called when open video from screen ↵Linux Build Service Account2016-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | off." into android_ui.lnx.1.2-dev
| * | | | Gallery2: fix doPrepared() not called when open video from screen off.Chao Zhang2016-03-261-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | doPrepared() not called because screen is off. so need call it again until mCurrentState isn't STATE_PREPARING. Change-Id: I8f865e319ab32f71ad99cf9052de56841d0de651 CRs-Fixed: 990113
* | | | Merge "Gallery2: enhance performance of update supported operation." into ↵Linux Build Service Account2016-03-292-24/+61
|\ \ \ \ | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | Gallery2: enhance performance of update supported operation.Chao Zhang2016-03-272-24/+61
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getSelectedMediaObjects() in updateSupportedOperation() is low performance if there are lots of photos, so menu options will not in correct state immediately, then crash occurred if click menu option. Use mSelectionManager.getSelectedCount() before getSelectedMediaObjects() to disable menu options and share items if need. Change-Id: I937a219ed294151c464f1d7b6ba2e526eef00c82 CRs-Fixed: 985315
* | | | Merge "Gallery: fix black screen playing HTTP stream" into ↵Linux Build Service Account2016-03-293-35/+25
|\ \ \ \ | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | Gallery: fix black screen playing HTTP streamLikai Ding2016-03-283-35/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Don't cover content when buffering. Use onInfo() instead of onBufferingUpdate() to determine buffering state. Change-Id: I49070662cbbae6bef86bb3cbaf18d1caf16cb9d4 CRs-Fixed: 994230
* | | | Merge "Gallery: fix "no photo found" when there are photos" into ↵Linux Build Service Account2016-03-292-5/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery: fix "no photo found" when there are photosLikai Ding2016-03-282-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base MediaSet in ClusterAlbumSet has a valid version number after initialization, causing ClusterAlbumSet.reload() to return immediately though it is not actually loaded. Change-Id: I1e05d31632694692025ac78a2d83200281f464ab CRs-Fixed: 984190
* | | | Merge "Gallery2: Play gif photo directly in photopage" into ↵Linux Build Service Account2016-03-299-352/+327
|\ \ \ \ | |/ / / |/| | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery2: Play gif photo directly in photopagehuiyan2016-03-279-352/+327
| | |/ | |/| | | | | | | | | | | | | | | | Implement new feature: Remove play icon and play the gif photo directly Change-Id: I95f82ca8ab912a98a5120ce2c01fe2fe33c9a875 CRs-Fixed: 987942
* / | Gallery: improve timeline loading performanceLikai Ding2016-03-286-279/+168
|/ / | | | | | | | | | | | | | | | | Rewritten TimeLineSlotView for memory consumption and performance. Slot position can be calculated by SubMediaSetCount on the fly. There is no need to iterate over all media items. Change-Id: I4372e0fa949b3321b9eb0ff476be52b6c8098a3b CRs-Fixed: 984190
* | Merge "Gallery2: fix the prompt overlapped if switch from Video to Album." ↵Linux Build Service Account2016-03-271-0/+1
|\ \ | | | | | | | | | into android_ui.lnx.1.2-dev
| * | Gallery2: fix the prompt overlapped if switch from Video to Album.Chao Zhang2016-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | hide the prompt in AlbumPage's onPause() like TimeLinePage. Change-Id: Iddbe4ed59559c1e2b5bef68bcd3afbb47cc14d40 CRs-Fixed: 982845
* | | Merge "Gallery2: revert filtershow panel layout to M style;" into ↵Linux Build Service Account2016-03-276-472/+98
|\ \ \ | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery2: revert filtershow panel layout to M style;Chao Zhang2016-03-246-472/+98
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | revert filtershow panel layout to M style according to UX specification document. delete filtershow_main_panel.xml in layout-land. Change-Id: I33a031063d8392fecf4de071f62bf46b2aaa57e2 CRs-Fixed: 988029 987904