summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Gallery2: fix share abnormal when select 300 photos."Linux Build Service Account2016-01-223-15/+25
|\
| * Gallery2: fix share abnormal when select 300 photos.Chao Zhang2016-01-223-15/+25
| | | | | | | | | | | | | | | | | | | | SelectManager add all path in ArrayList, so selected count is not the same as actual count. Just add selectable path in SelectManager. Change-Id: I76cc1505e65fceff1785a02badd17569e46b4947 CRs-Fixed: 963290
* | Gallery2: Auto pause and replay video when audio focus changed.zdi2016-01-222-10/+56
|/ | | | | | | | Add OnAudioFocusChangeListener in CodeauroraVideoView, pause video when lose audio focus and replay video when gain audio focus. Change-Id: Id8e3e4b0afbc72892301a08fb8a122c285fbfe97 CRs-Fixed: 962677
* Merge "Gallery2: fix video play abnormal when screen is locked."Linux Build Service Account2016-01-211-1/+18
|\
| * Gallery2: fix video play abnormal when screen is locked.Chao Zhang2016-01-201-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | play video --> lock screen --> call in --> refuse the call. after this step, screen is locked, but video is resume playing because CodeauroraVideoView's doPrepared() is called. add a check of KeyguardManager.inKeyguardRestrictedInputMode() in CodeauroraVideoView.doPreparedIfReady() like MovieActivity. Change-Id: I19d9da0d23ca490e5038316d6b982099b8280aba CRs-Fixed: 945013
* | Merge "Gallery2: Release MediaPlayer when the error occurred."Linux Build Service Account2016-01-211-0/+2
|\ \
| * | Gallery2: Release MediaPlayer when the error occurred.zdi2016-01-201-0/+2
| | | | | | | | | | | | | | | | | | | | | Release MediaPlayer when the error occurred, avoid exception occurred. Change-Id: Iaa250e9e783f7d8ec06ff8c3603b8e5868c0dc4e CRs-Fixed: 963171
* | | Merge "Gallery2: Fix screen flicker after wake up."Linux Build Service Account2016-01-201-2/+2
|\ \ \
| * | | Gallery2: Fix screen flicker after wake up.yongga2016-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the decode of full image is not ready, there will be a black Rect fill in the view. As a result, there will be a filcker. Cancel the black rect during decoder. Change-Id: Ife6984897cd21715c0e4376ee2e717fd2244a8f6 CRs-Fixed: 954007
* | | | Merge "Gallery2: fix delete abnormal when select all photos."Linux Build Service Account2016-01-201-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Gallery2: fix delete abnormal when select all photos.Chao Zhang2016-01-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove timeline title item's all supported operations, otherwise all sub objects will be affected. Change-Id: If7e332f68d80da72bc819223169abca238fd2eb6 CRs-Fixed: 960220
* | | | Merge "Gallery2: fix a crash caused by NullPointerException."Linux Build Service Account2016-01-191-1/+2
|\ \ \ \
| * | | | Gallery2: fix a crash caused by NullPointerException.wqi2016-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeLineSlidingWindow.get() may return null value. add null value check. Change-Id: Ic7c58aa5b6d2e6bd06b9d60e1884f1114411e787 CRs-Fixed: 961574
* | | | | Merge "Gallery2: Modify the color of color_chooser_unslected_border."Linux Build Service Account2016-01-191-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Gallery2: Modify the color of color_chooser_unslected_border.yongga2016-01-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The color of color_chooser_unslected_border is transparent lead to black button cannot be seen. Modify the color of color_chooser_unslected_border. Change-Id: I41bcc8f70dc0f622d6b4a1d8d09f96221e2e7192 CRs-Fixed: 959503
* | | | Merge "Gallery2: Avoid showing error dialog multiple times"Linux Build Service Account2016-01-191-1/+4
|\ \ \ \
| * | | | Gallery2: Avoid showing error dialog multiple timesmqi2016-01-181-1/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When framework sent error message frequently gallery will show error dialog multiple times which will cause lmk. Add condition to check if error dialog is already showing, avoid showing it again. Change-Id: I901b93c820bd760b52796432870d148f93a091c3 CRs-Fixed: 835360
* / | | Gallery2: fix a crash when print a photo received from Bluetooth.Chao Zhang2016-01-191-2/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | An IllegalArgumentException occurs because printJobName is null. If printJobName is null, set a default print job name. Change-Id: Ia20813f6f2e5ad4936e4db413c94b8fc4975d590 CRs-Fixed: 960251
* | | Merge "Gallery2: Fix show the wrong UI after resume when the video stop."Linux Build Service Account2016-01-181-2/+11
|\ \ \
| * | | Gallery2: Fix show the wrong UI after resume when the video stop.huiyan2016-01-161-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view background is transparent when the video stop, and then it will show the wallpaper after resume. set transparent background when the video is playing or pause, and set black background on other status(stop,end,error) Change-Id: Ib97ed6b4f716ff512e7f6f258fd8ddfbdecf5587 CRs-Fixed: 952289
* | | Merge "Gallery2: Lock and close mDrawerLayout if not supported."Linux Build Service Account2016-01-171-15/+14
|\ \ \ | |/ / |/| |
| * | Gallery2: Lock and close mDrawerLayout if not supported.chaoz2016-01-151-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mDrawerLayout is not supported in some entrances, such as Intent.ACTION_VIEW, Intent.ACTION_GET_CONTENT, Intent.PICK. So lock and close it. Change-Id: I47cb7d93c07b63ced45717faea7b37b22327721e CRs-Fixed: 960253
* | | Merge "Gallery2: fix "Done" Button is covered on crop activity with landscape."Linux Build Service Account2016-01-151-1/+1
|\ \ \
| * | | Gallery2: fix "Done" Button is covered on crop activity with landscape.yongga2016-01-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | "Done" Button is covered on crop activity with landscape. modify paddingBottom value. Change-Id: Ie52684cd2b1b4aee518de2360559b1dd8738f5ed CRs-Fixed: 961037
* | | Merge "Gallery2: Hide "Delete" button on photo page if need."Linux Build Service Account2016-01-151-1/+1
|\ \ \
| * | | Gallery2: Hide "Delete" button on photo page if need.yongga2016-01-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Delete operation is not supported when KEY_READONLY is true, so hide "Delete" button to avoid exception. Change-Id: Id10d02db937ed597e4de33650868c3c555842b8d CRs-Fixed: 960432
* | | Merge "Gallery2: fix edit panel's label is overlaped in edit page."Linux Build Service Account2016-01-151-1/+7
|\ \ \
| * | | Gallery2: fix edit panel's label is overlaped in edit page.yongga2016-01-141-1/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Edit panel's label is overlaped in edit page. Move the label to the bottom. Change-Id: I8860d6fd9dc86a53135d85b15c5d13de7bf60cb7 CRs-Fixed: 959499
* | | Merge "Gallery2: fix a crash when print a photo received from Bluetooth."Linux Build Service Account2016-01-151-10/+19
|\ \ \
| * | | Gallery2: fix a crash when print a photo received from Bluetooth.yongga2016-01-131-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An IllegalArgumentException occurs when getLocalPathFromUri(). catch this Exception and ensure print job work normally. Change-Id: I6c1f9912ac58ea23224c420da6327475a6935267 CRs-Fixed: 960251
* | | | Merge "Gallery2: Fix can't show the thumbnails when the storage full"Linux Build Service Account2016-01-151-0/+9
|\ \ \ \
| * | | | Gallery2: Fix can't show the thumbnails when the storage fullyongga2016-01-131-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NullPointerException occur and then it can't decode the thumbnails. Determine whether the reference is instantiated before invoking it. Change-Id: Id68da30d15c88eb029f83fbde25912b9e07ce062 CRs-Fixed: 954026
* | | | Merge "Gallary2: Change the background color of HistogramView."Linux Build Service Account2016-01-152-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Gallary2: Change the background color of HistogramView.yongga2016-01-132-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The layout's background color is as same as the backgroud color of HistogramView. Change the background color of HistogramView. Change-Id: Id0411bf41c100b22b5b0a3a152efc36282bdbdbd CRs-Fixed: 959504
* | | Merge "Gallery2: fix display abnormal when select all photos."Linux Build Service Account2016-01-132-1/+22
|\ \ \
| * | | Gallery2: fix display abnormal when select all photos.yongga2016-01-092-1/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The "More" button is still shown when select all, select "Edit/Set picture as" will cause crash because this function just can be used for 1 photo. hide the "More" button when select all. Change-Id: I3b378052c919844f4df007892effb303c5876072 CRs-Fixed: 954079
* | | Merge "Gallery2: fix display abnormal when select all on timeline page."Linux Build Service Account2016-01-135-4/+70
|\ \ \
| * | | Gallery2: fix display abnormal when select all on timeline page.yongga2016-01-075-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. number of selection display more than actual selection, because it include title items. calculate correct number of selection exclude title items. 2. share and delete icon not display because an Exception occurs. Override getContentUri() method in MediaSet.java to avoide exception because getContentUri() of MediaObject.java must be override. Change-Id: Ida549d6f7f5ebfea344dcdfd47f7dad48ba1f65d CRs-Fixed: 948409
* | | | Merge "Gallery2: fix display abnormal on album page when in RTL mode."Linux Build Service Account2016-01-131-11/+10
|\ \ \ \
| * | | | Gallery2: fix display abnormal on album page when in RTL mode.yongga2016-01-121-11/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Count text view of album label display abnormal because x position < 0. Set correct x position. Change-Id: Ibf017e1ffee3743b9a936ee91ed12f415c07ec89 CRs-Fixed: 953085
* | | | Merge "Gallery2: Fix FATAL EXCEPTION when deleting some images in list view."Linux Build Service Account2016-01-131-2/+4
|\ \ \ \
| * | | | Gallery2: Fix FATAL EXCEPTION when deleting some images in list view.yongga2016-01-111-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bitmap is recycled. Determine whether the bitmap is recycled before invoking it. Change-Id: Ia62f99d6aa8733c0175ff6badaeaf84e09ff68dc CRs-Fixed: 954022
* | | | Merge "Gallery2: fix a Gallery2 crash when copy images by file manager."Linux Build Service Account2016-01-131-2/+4
|\ \ \ \
| * | | | Gallery2: fix a Gallery2 crash when copy images by file manager.yongga2016-01-111-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch timeline/albums/video quickly when copy images by file manager, NullpointException occurs because getSubMediaSet() returns null. Add a null value check. Change-Id: Ifffd97e700d6ac80d1acf28bf7779c4d01716bb0 CRs-Fixed: 954037
* | | | Merge "Gallery2: fix display abnormal when reload photos."Linux Build Service Account2016-01-133-47/+55
|\ \ \ \
| * | | | Gallery2: fix display abnormal when reload photos.yongga2016-01-113-47/+55
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tvEmptyAlbum is still shown because hideEmptyAlbumToast() not called when mAlbumDataAdapter.size() != 0. make sure don't create a new tvEmptyAlbum when showEmptyAlbumToast(), and call hideEmptyAlbumToast() when mAlbumDataAdapter.size() != 0. Change-Id: I494011e54b4e150801019a3e2f9b430fb9ed999a CRs-Fixed: 955208
* | | | Merge "Gallery2: Fix null pointer exception from customer monkey test."Linux Build Service Account2016-01-131-16/+19
|\ \ \ \
| * | | | Gallery2: Fix null pointer exception from customer monkey test.yongga2016-01-111-16/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reference is not instantiated before invoking it. Determine whether the reference is instantiated before invoking it. Change-Id: I879877159f5b2ebe9d38e9d319d299f5b0534999 CRs-Fixed: 954744
* | | | Merge "Gallery2: Fix no android.permission.INTERACT_ACROSS_USERS in guest mode."Linux Build Service Account2016-01-131-0/+2
|\ \ \ \
| * | | | Gallery2: Fix no android.permission.INTERACT_ACROSS_USERS in guest mode.yongga2016-01-091-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guest don't have permission to set system property. add the permission for guest. Change-Id: I8d63da7f94d27ee2ceb4a04b19d85afe097b1659 CRs-Fixed: 954666 95622