android_packages_apps_Gallery2, branch caf/cm-12.1 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1 2015-05-05T17:43:36+00:00 Matt Garnes matt@cyngn.com 2015-04-30T18:01:17+00:00 fbab7f32d2014c2bdae4eccf99d31ca76d0bf8f6 Conflicts: res/layout/action_mode.xml Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1 
Conflicts:
	res/layout/action_mode.xml

Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1
Merge "Gallery2 : Video share option is not working" 2015-04-16T15:47:58+00:00 Linux Build Service Account lnxbuild@localhost 2015-04-16T15:47:58+00:00 725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73 






Gallery2 : Video share option is not working
2015-04-16T07:32:32+00:00

Paramananda
parama@codeaurora.org

2015-04-16T06:02:34+00:00

62ea8820f20d39767fd8472d8f1458edca3dcf0f

- Issue is due to OMA DRM integration on the platform.
- Added video share option on local video supported operation list.
CRs-Fixed: 822784

Change-Id: Ia2a81b5f08ac02b98dd365b788d766ae3b57020e





- Issue is due to OMA DRM integration on the platform.
- Added video share option on local video supported operation list.
CRs-Fixed: 822784

Change-Id: Ia2a81b5f08ac02b98dd365b788d766ae3b57020e







Merge "Gallery2 : Delete and Details options are not visible on Camera preview"
2015-04-14T13:25:19+00:00

Linux Build Service Account
lnxbuild@localhost

2015-04-14T13:25:19+00:00

be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb












Gallery2 : Delete and Details options are not visible on Camera preview
2015-04-13T11:21:31+00:00

Paramananda
parama@codeaurora.org

2015-04-13T10:21:51+00:00

b6d1df6f74493f4ca7586fe1f755c38488e025f2

Added SUPPORT_DELETE and SUPPRT_INFO option on option item
of image preview screen.
CRs-Fixed: 819964

Change-Id: If8bbc702073d7193afb445feaa08d766886d3f22





Added SUPPORT_DELETE and SUPPRT_INFO option on option item
of image preview screen.
CRs-Fixed: 819964

Change-Id: If8bbc702073d7193afb445feaa08d766886d3f22







Merge "Gallery2 : Drm file can be set as wallpaper"
2015-04-08T13:39:28+00:00

Linux Build Service Account
lnxbuild@localhost

2015-04-08T13:39:28+00:00

1588d7f5686d54fb67745c029781e7629ef148c1












Merge "Gallery2: Gallery2 can't show the newest picture"
2015-04-08T05:21:14+00:00

Linux Build Service Account
lnxbuild@localhost

2015-04-08T05:21:14+00:00

c3b72e8029c3232c37d1c96db25d5d5ea04d6f91












Gallery2 : Drm file can be set as wallpaper
2015-04-06T11:31:22+00:00

Paramananda
parama@codeaurora.org

2015-03-24T12:36:39+00:00

e45ba22d0350a0ba7ab382bde1f0dbd72ec70675

- Only DRM FL file can be set as device wallpaper. Other
  licenseable files like CD and SD can not be allow for wallpaper
  because after license expaired we can not revert wallpaper
  to default.
CRs-Fixed: 804190

Change-Id: I42f501b6a06a057765f80a6a124970bec6619e85





- Only DRM FL file can be set as device wallpaper. Other
  licenseable files like CD and SD can not be allow for wallpaper
  because after license expaired we can not revert wallpaper
  to default.
CRs-Fixed: 804190

Change-Id: I42f501b6a06a057765f80a6a124970bec6619e85







Merge "Gallery2 : Drm lock icon added on Photo widget for drm content"
2015-04-05T12:09:15+00:00

Linux Build Service Account
lnxbuild@localhost

2015-04-05T12:09:15+00:00

fba9836dc0c9959cb5728828c4fdc8e142d21fca












Merge "Gallery2 : GIF animated drm file can be visible in Gallery app"
2015-04-05T12:09:15+00:00

Linux Build Service Account
lnxbuild@localhost

2015-04-05T12:09:15+00:00

977003b637af107a3353c2326633efe53b03f600