summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Gallery2: Fix menu icon is missing when change language on Videos ↵Linux Build Service Account2016-04-252-2/+17
|\ | | | | | | page." into android_ui.lnx.1.2-dev
| * Gallery2: Fix menu icon is missing when change language on Videos page.huiyan2016-04-222-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the gallery is in background ,the video page is saved to the stack. After the language change, the Gallery is destroyed. If gallery start again, the video page is restored from the stack. But the action bar is set to don't display the home as up in onResume, which set the navigation icon to null, so the menu icon can't display. If albumpage is started by Video option, the action bar set to display home option. If albumpage is start by others(albumnsetpage), the action bar set to display home as up option,to display menu icon or up icon rightly in action bar. Besides, fix to display the right title with the different language. Change-Id: Ieec0bd47400f6c0b698f5c2e842dc1038d9addcf CRs-Fixed: 1002171
* | Merge "Revert "Gallery2: Set PhotoPage GL root reset when rotate"" into ↵Linux Build Service Account2016-04-252-18/+0
|\ \ | | | | | | | | | android_ui.lnx.1.2-dev
| * | Revert "Gallery2: Set PhotoPage GL root reset when rotate"huiyan2016-04-212-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 104f367812c753362c9c077d1d010e127e3be7f1. Change the orientation in SlideshowPage which is active, photoPage reload the data and invalidate UI in inactive state. This cause UI is black when return from SlideshowPage to PhotoPage. So revert it to avoid reloading data and invalidating UI, if PhotoPage is inactive state and the orientation change. Change-Id: Ia60af41662c60858d92d00fcacb6686a123c0e21 CRs-Fixed: 997153
* | | Gallery2: hide action bar in photo editor if there has bottom panel.Chao Zhang2016-04-225-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | 1. hide action bar in photo editor if there has bottom panel. 2. hide SAVE button and Reset menu item if no modifications. Change-Id: If8e78d95052dbfdc44a5c5edeb464d2fb4e43af5 CRs-Fixed: 988053 988059
* | | Gallery2: Modified layout of crop and exposure model in photo editor.wqi2016-04-2213-32/+577
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | 1. Modified layout in crop model. 2. Remove mirror and draw only keep crop, straighten, rotate in crop model. 3. Adjust style of seekbar in exposure model. 4. Modified layout in exposure model. 5. Remove '4:3', '3:4', '5:7' and '7:5' functions from crop. According to UX specification document. Change-Id: Ib536b3f57a83053bac8fc6ec778675a82b6327e6 CRs-Fixed: 988082 988090
* | Merge "Gallery2: fix some abnormal of comparison button in photo editor." ↵Linux Build Service Account2016-04-223-7/+24
|\ \ | |/ |/| | | into android_ui.lnx.1.2-dev
| * Gallery2: fix some abnormal of comparison button in photo editor.Chao Zhang2016-04-213-7/+24
| | | | | | | | | | | | | | | | | | | | 1. don't call backToMain() when press comparison button. 2. don't call updateCategories() when press comparison button. 3. fix comparison button disappeared when exit Crop editor. 4. hide comparison button in Straighten editor. Change-Id: Ib5d2a9df59d2e1c5ed0d0764dc7520c1ed518207 CRs-Fixed: 1005753
* | Merge "Gallery2: Fix UI display wrongly after deleting some pictures in ↵Linux Build Service Account2016-04-215-12/+44
|\ \ | | | | | | | | | photopage." into android_ui.lnx.1.2-dev
| * | Gallery2: Fix UI display wrongly after deleting some pictures in photopage.huiyan2016-04-215-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kind in TimeLinePage is set to wrong value after retrun from photopage, so the UI display wrongly. The albums from dataManger is not cleared after delete all the photos, so can't finish the photopage after deleting the last photo. Set the right value to kind in timelinepage after return from photopage. And set the empty path to the albums which don't exist from dataManger, to finsih the photopage after delete the last photo. Change-Id: I09d4d5349ce5e78a2be3129510d822584bfa57db CRs-Fixed: 991313
* | | Gallery: fix error when license expiresLikai Ding2016-04-211-1/+1
|/ / | | | | | | | | | | | | | | License expired pop-up will appear for multiple times. Check error status when start the video. Change-Id: I7ce509aec6859c8117aebc01c7a3c828221aafa3 CRs-Fixed: 980372
* | Merge "Gallery2: Fix the image add to the status bar." into ↵Linux Build Service Account2016-04-212-3/+12
|\ \ | |/ |/| | | android_ui.lnx.1.2-dev
| * Gallery2: Fix the image add to the status bar.huiyan2016-04-202-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gallery is killed by system in background due to some reason. The Gallery restore last states after restart it. But the mediaset is loading, the reload function return immediately, and the data is empty,the Photopage is finished when the data is empty. So the UI is wrong. If the mediaset is loading, waiting for it. After loading successfully, display the right photo. Change-Id: Icb95524bd151145beeba83205b365065fbb20530 CRs-Fixed: 979193
* | Merge "Gallery2: fix photo count display abnormal on Timeline title." into ↵Linux Build Service Account2016-04-201-2/+0
|\ \ | | | | | | | | | android_ui.lnx.1.2-dev
| * | Gallery2: fix photo count display abnormal on Timeline title.Chao Zhang2016-04-191-2/+0
| | | | | | | | | | | | | | | | | | | | | Don't ellipsis photo count string on Timeline title. Change-Id: I348bb6b31daff516c50530d4d393481041ada84e CRs-Fixed: 1000943
* | | Merge "Gallery: fix crash after deletion" into android_ui.lnx.1.2-devLinux Build Service Account2016-04-202-17/+23
|\ \ \
| * | | Gallery: fix crash after deletionLikai Ding2016-04-152-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an image is deleted, before UI update, it can still be selected. Add checks to avoid crash. Change-Id: I1eaa74fb62c5f4d205b82854bc75d442bf59fee0 CRs-Fixed: 991985
* | | | Merge "Gallery2: Adjust the layout of trim video and Audio+." into ↵Linux Build Service Account2016-04-203-18/+47
|\ \ \ \ | | | | | | | | | | | | | | | android_ui.lnx.1.2-dev
| * | | | Gallery2: Adjust the layout of trim video and Audio+.zdi2016-04-193-18/+47
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Adjust the view of trim and Audio+ according to UX specification document. Change-Id: I20066bace85c1956e7a27e5e63bd6eeeedca183e CRs-Fixed: 1003393
* | | | Merge "Gallery2: Add video snapshot function according to UI spec." into ↵Linux Build Service Account2016-04-205-2/+375
|\ \ \ \ | |/ / / |/| | | | | | | android_ui.lnx.1.2-dev
| * | | Gallery2: Add video snapshot function according to UI spec.Chao Zhang2016-04-195-2/+375
| | |/ | |/| | | | | | | | | | | | | | | | Add video snapshot function. Change-Id: I225d2c5a8f4a0b022e9dd2b517a98ddaf35dcf4a CRs-Fixed: 988600
* | | Gallery2: Modify actionbar in photo editor interface.wqi2016-04-183-75/+76
| | | | | | | | | | | | | | | | | | | | | | | | Add a exit button and move save button to right in photo editor interface according to UX specification document. Change-Id: I2cdbb0b4967822b78f65af6eea2b8571a6e653b9 CRs-Fixed: 988043
* | | Gallery2: Modified layout of main panel in photo editor interface.wqi2016-04-186-50/+66
|/ / | | | | | | | | | | | | | | | | | | | | | | 1. Change shape of iconview to square. 2. Add label on the bottom of iconview. 3. Change main panel background to transparent. 4. Change pictures of bottom icons in main panel. 5. Remove preset item if it has for each model filter. according to UX specification document. Change-Id: I81034c2e26e5ff1844826f0810bb91bbbaceb1ad CRs-Fixed: 988070 988051
* | Merge "Gallery2: fix photo widget has not sync after delete the photo." into ↵Linux Build Service Account2016-04-171-0/+67
|\ \ | | | | | | | | | android_ui.lnx.1.2-dev
| * | Gallery2: fix photo widget has not sync after delete the photo.Chao Zhang2016-04-141-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | Use a ContentObserver to observe uri's change. If uri is deleted, show a empty view in widght. Change-Id: I11f0632ed96958a74b6aa2cdd9c2f1d88c99e94e CRs-Fixed: 981663
* | | Merge "Gallery: fix an ANR in slide show" into android_ui.lnx.1.2-devLinux Build Service Account2016-04-171-1/+0
|\ \ \
| * | | Gallery: fix an ANR in slide showLikai Ding2016-04-151-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | waitDone() is called in SlideshowDataAdapter.pause(), which causes ANR when database is busy. It's not necessary to sync there. Change-Id: I4bd2594987f5fb16a50775e8cede9fed68c7bea0 CRs-Fixed: 997382
* | | Gallery2: Modify live stream view according to UI spec.zdi2016-04-145-6/+84
| |/ |/| | | | | | | | | | | Modify the UI of live stream according to UX specification document. Change-Id: Ibe13499288ab1896c0901825c556b4e9ad01bcd2 CRs-Fixed: 988695
* | Gallery2: Remove some menu items in editor interface.wqi2016-04-121-12/+0
|/ | | | | | | | | 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-052-48/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 08:36:57 +0000