OSDN Git Service
Bobby Georgescu [Fri, 28 Sep 2012 07:47:07 +0000 (00:47 -0700)]
am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
c7e3c76d6965f520a9651d309052c5f01726cd58':
Show a placeholder when the camera filmstrip is empty
Bobby Georgescu [Thu, 27 Sep 2012 23:36:03 +0000 (16:36 -0700)]
Show a placeholder when the camera filmstrip is empty
Bug:
7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.
Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
Mangesh Ghiware [Fri, 28 Sep 2012 06:49:42 +0000 (23:49 -0700)]
am
2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches
* commit '
2e8472f304737acc3fbeb167b1b6f660f111f5c7':
Update to sharing panorama
Mangesh Ghiware [Fri, 28 Sep 2012 06:48:44 +0000 (23:48 -0700)]
Merge "Update to sharing panorama" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 28 Sep 2012 04:05:41 +0000 (21:05 -0700)]
Update to sharing panorama
Bug:
7150324
Use separate share intents for sharing panoarma and regular JPGs.
If photo is a 360 panorama, promote sharing it on the action bar,
and move sharing as JPG to overflow menu.
MIME type changed to specify panorama360.
Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
nicolasroard [Fri, 28 Sep 2012 04:45:54 +0000 (21:45 -0700)]
am
5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
* commit '
5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
nicolasroard [Fri, 28 Sep 2012 04:43:57 +0000 (21:43 -0700)]
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
nicolasroard [Fri, 28 Sep 2012 03:54:48 +0000 (20:54 -0700)]
Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.
bug:
7234317
bug:
7233975
bug:
7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
Baligh Uddin [Fri, 28 Sep 2012 04:11:26 +0000 (21:11 -0700)]
am
8473d944: (-s ours) Import translations. DO NOT MERGE
* commit '
8473d94491059a07e9969de14751d5d3fd929061':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 04:00:18 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0129ab582567ff7cb3d4202d5a489fe0e09e3b86
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 03:59:05 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7669fd2cd14f553106779c0a60e60400d6c9f196
Auto-generated-cl: translation import
Bobby Georgescu [Fri, 28 Sep 2012 03:48:09 +0000 (20:48 -0700)]
am
624ed9df: Fix up button behavior in camera app
* commit '
624ed9df710ac4e34f3ff1d0c3bf4acd1c056258':
Fix up button behavior in camera app
Bobby Georgescu [Fri, 28 Sep 2012 01:10:06 +0000 (18:10 -0700)]
Fix up button behavior in camera app
Bug:
7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
nicolasroard [Thu, 27 Sep 2012 23:30:51 +0000 (16:30 -0700)]
am
863b4e65: We weren\'t applying the parameter on an existing filter
* commit '
863b4e65d172a19111f46e43f97e7e41927a3bc7':
We weren't applying the parameter on an existing filter
nicolasroard [Thu, 27 Sep 2012 23:25:12 +0000 (16:25 -0700)]
We weren't applying the parameter on an existing filter
bug:
7247494
Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
nicolasroard [Thu, 27 Sep 2012 23:20:26 +0000 (16:20 -0700)]
am
9579b815: Only apply the parameter to the currently edited filter
* commit '
9579b81504c16ac77aa7442767fbabe6abcfe24b':
Only apply the parameter to the currently edited filter
nicolasroard [Thu, 27 Sep 2012 23:05:23 +0000 (16:05 -0700)]
Only apply the parameter to the currently edited filter
bug:
7247494
Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
John Reck [Thu, 27 Sep 2012 23:06:13 +0000 (16:06 -0700)]
am
98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches
* commit '
98d17b863a5c8dc194496422459e73d7d38a2b9e':
Fix Monkey NPE
John Reck [Thu, 27 Sep 2012 23:04:56 +0000 (16:04 -0700)]
Merge "Fix Monkey NPE" into gb-ub-photos-arches
nicolasroard [Thu, 27 Sep 2012 22:50:51 +0000 (15:50 -0700)]
am
02f778af: Remove the pie slider, add a linear slider
* commit '
02f778af1f8a2250d91da450f82c30572de96062':
Remove the pie slider, add a linear slider
nicolasroard [Thu, 27 Sep 2012 22:10:28 +0000 (15:10 -0700)]
Remove the pie slider, add a linear slider
bug:
7247494
Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
John Reck [Thu, 27 Sep 2012 22:26:00 +0000 (15:26 -0700)]
Fix Monkey NPE
Bug:
7243032
Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
Teng-Hui Zhu [Thu, 27 Sep 2012 21:21:42 +0000 (14:21 -0700)]
am
65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
* commit '
65f1bad399eca7fe1e31808f2cb0ad3c9399901e':
Trimming: clean up the UI for trimming.
Teng-Hui Zhu [Thu, 27 Sep 2012 21:20:18 +0000 (14:20 -0700)]
Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
nicolasroard [Thu, 27 Sep 2012 19:28:40 +0000 (12:28 -0700)]
am
f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
* commit '
f37e1e9a9ce5aade5ccb1ad24b754bde29327716':
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
nicolasroard [Thu, 27 Sep 2012 19:20:11 +0000 (12:20 -0700)]
Add the intent filter to start the new editor
Set Gallery to identify as needing a largeHeap
bug:
7246621
Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94
Teng-Hui Zhu [Wed, 26 Sep 2012 23:34:44 +0000 (16:34 -0700)]
Trimming: clean up the UI for trimming.
Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.
bug:
7093240
Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
Baligh Uddin [Thu, 27 Sep 2012 17:00:20 +0000 (10:00 -0700)]
am
8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8f6dc9eab9feca563b08400a7ebd74fb5d0e3075':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Sep 2012 16:58:26 +0000 (09:58 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Thu, 27 Sep 2012 16:55:07 +0000 (09:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Teng-Hui Zhu [Thu, 27 Sep 2012 16:22:46 +0000 (09:22 -0700)]
am
27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
* commit '
27e933b00279c177ae0d36b599aa1c90870922c1':
Trimming: switch to use sherlock action bar
Teng-Hui Zhu [Thu, 27 Sep 2012 16:21:14 +0000 (09:21 -0700)]
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
Wu-cheng Li [Thu, 27 Sep 2012 07:16:46 +0000 (00:16 -0700)]
am
743f8152: Several secure album changes.
* commit '
743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5':
Several secure album changes.
Wu-cheng Li [Thu, 27 Sep 2012 06:01:39 +0000 (14:01 +0800)]
Several secure album changes.
- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
"unlocked" lock.
bug:
7192331
Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
Owen Lin [Thu, 27 Sep 2012 05:34:46 +0000 (22:34 -0700)]
am
4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches
* commit '
4419f551b4ccb7457626dbb5a37c41afd71eb5ed':
Don't set treat back as up if there is no parent album.
Owen Lin [Thu, 27 Sep 2012 05:33:55 +0000 (22:33 -0700)]
Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
Wu-cheng Li [Thu, 27 Sep 2012 04:11:16 +0000 (21:11 -0700)]
am
b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
* commit '
b904ecba4fed5c6abd877a326acfbd0440887b62':
Show unlock image in secure album only when camera roll has items.
Wu-cheng Li [Thu, 27 Sep 2012 04:09:25 +0000 (21:09 -0700)]
Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
Wu-cheng Li [Thu, 27 Sep 2012 03:35:43 +0000 (20:35 -0700)]
am
53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
* commit '
53605baff27905497fa38ec3887db1d031af5152':
Fix background replacement crash in camcorder.
Wu-cheng Li [Thu, 27 Sep 2012 03:34:04 +0000 (20:34 -0700)]
Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
Wu-cheng Li [Thu, 27 Sep 2012 02:49:46 +0000 (10:49 +0800)]
Fix background replacement crash in camcorder.
Add proguard flag to prevent methods from removing.
bug:
7106963
Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028
nicolasroard [Thu, 27 Sep 2012 02:09:32 +0000 (19:09 -0700)]
am
e3f9f579: Load the correct library...
* commit '
e3f9f579d73af613a33ba1d0a93dc101ea671a69':
Load the correct library...
nicolasroard [Thu, 27 Sep 2012 02:05:08 +0000 (19:05 -0700)]
Load the correct library...
bug:
7165910
Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
nicolasroard [Thu, 27 Sep 2012 00:52:55 +0000 (17:52 -0700)]
nicolasroard [Thu, 27 Sep 2012 00:50:19 +0000 (17:50 -0700)]
Fix the build
Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924
Teng-Hui Zhu [Wed, 26 Sep 2012 21:20:46 +0000 (14:20 -0700)]
Trimming: switch to use sherlock action bar
Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.
bug:
7093240
Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
John Reck [Wed, 26 Sep 2012 23:24:55 +0000 (16:24 -0700)]
am
2ce4bec8: Only create debugTag if necessary
* commit '
2ce4bec82fd46ff71ee4a586719904a6313689bf':
Only create debugTag if necessary
John Reck [Wed, 26 Sep 2012 23:24:54 +0000 (16:24 -0700)]
am
8fe22ecb: Don\'t requery a constant
* commit '
8fe22ecb8e744a09a2e0d867f876ecbf74c82298':
Don't requery a constant
John Reck [Wed, 26 Sep 2012 23:20:09 +0000 (16:20 -0700)]
Only create debugTag if necessary
Bug:
7238418
String concatenation isn't free
Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
John Reck [Wed, 26 Sep 2012 23:13:02 +0000 (16:13 -0700)]
Don't requery a constant
Bug:
7238418
Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
nicolasroard [Wed, 26 Sep 2012 23:15:34 +0000 (16:15 -0700)]
am
0d7cdf8e: Initial import of the new image editor
* commit '
0d7cdf8e763fb65c32bfad65245b3753deb75737':
Initial import of the new image editor
nicolasroard [Tue, 25 Sep 2012 21:27:56 +0000 (14:27 -0700)]
Initial import of the new image editor
bug:
7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
Bobby Georgescu [Wed, 26 Sep 2012 22:49:07 +0000 (15:49 -0700)]
am
833f775a: Fix behavior of up button in Camera app
* commit '
833f775afc9515567dc5aaf0cafe20e006e77545':
Fix behavior of up button in Camera app
Bobby Georgescu [Wed, 26 Sep 2012 21:22:57 +0000 (14:22 -0700)]
Fix behavior of up button in Camera app
Bug:
7233448
- Up button now goes to gallery root when appropriate.
Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
Baligh Uddin [Wed, 26 Sep 2012 21:44:37 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e74df054094b23690d3a8859ecd9dbf0c34b58b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Sep 2012 21:43:56 +0000 (14:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I088c132a236954dd59ea069ab107dd0d4427b54d
Auto-generated-cl: translation import
John Reck [Wed, 26 Sep 2012 21:26:27 +0000 (14:26 -0700)]
am
726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
* commit '
726cbd1af44cf7b0f795c4f0639b9b358be960c1':
Avoid unnecessary allocation
John Reck [Wed, 26 Sep 2012 21:24:22 +0000 (14:24 -0700)]
Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
Teng-Hui Zhu [Wed, 26 Sep 2012 20:51:09 +0000 (13:51 -0700)]
am
eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
* commit '
eb90d7e21a4814a920de5c7d6e5f662d7f0e6865':
Trimming: switch to use selectors.
Teng-Hui Zhu [Wed, 26 Sep 2012 20:48:50 +0000 (13:48 -0700)]
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
Teng-Hui Zhu [Mon, 24 Sep 2012 23:36:36 +0000 (16:36 -0700)]
Trimming: switch to use selectors.
Switch into using 2 selectors for the starting and end point of triming.
Shift the bar up a bit to accommandate the selectors.
bug:
7093240
Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
John Reck [Wed, 26 Sep 2012 18:37:23 +0000 (11:37 -0700)]
Avoid unnecessary allocation
Bug:
7238418
Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
Owen Lin [Thu, 20 Sep 2012 04:22:54 +0000 (12:22 +0800)]
Don't set treat back as up if there is no parent album.
Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274
fix:
7180467
Bobby Georgescu [Wed, 26 Sep 2012 18:26:08 +0000 (11:26 -0700)]
am
3fd76400: Fix display of clustering items in album set page
* commit '
3fd764008a73dd76be87b02f42d0e00786015c8a':
Fix display of clustering items in album set page
Bobby Georgescu [Wed, 26 Sep 2012 00:23:22 +0000 (17:23 -0700)]
Fix display of clustering items in album set page
Bug:
7217602
There was an incorrect assumption that onCreateActionBar
would always be called before onResume.
Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
Wu-cheng Li [Wed, 26 Sep 2012 10:20:11 +0000 (18:20 +0800)]
Show unlock image in secure album only when camera roll has items.
bug:
7192331
Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
Wu-cheng Li [Wed, 26 Sep 2012 06:12:12 +0000 (23:12 -0700)]
am
9c3912a2: Remove icon attributon.
* commit '
9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269':
Remove icon attributon.
Wu-cheng Li [Wed, 26 Sep 2012 05:46:21 +0000 (13:46 +0800)]
Remove icon attributon.
bug:
6855540
Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
Doris Liu [Tue, 25 Sep 2012 20:59:46 +0000 (13:59 -0700)]
am
e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches
* commit '
e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3':
Making switchState public
Doris Liu [Tue, 25 Sep 2012 20:58:36 +0000 (13:58 -0700)]
Merge "Making switchState public" into gb-ub-photos-arches
Bart Sears [Tue, 25 Sep 2012 20:56:22 +0000 (13:56 -0700)]
am
99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
* commit '
99420758f796b4d461c40033b886a0b464986902':
Revert "Update gallery launcher icons."
Bart Sears [Tue, 25 Sep 2012 20:54:22 +0000 (13:54 -0700)]
Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
Bobby Georgescu [Tue, 25 Sep 2012 20:00:49 +0000 (13:00 -0700)]
am
00ccf35f: Grid/filmstrip switching behavior improvements
* commit '
00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14':
Grid/filmstrip switching behavior improvements
Bart Sears [Tue, 25 Sep 2012 19:57:56 +0000 (12:57 -0700)]
Revert "Update gallery launcher icons."
For now, go back to JB icons for Gallery
Bug:
6855540
This reverts commit
9bf98d94d59571d220f7e288f565f599422f9b82
Change-Id: I1659134d54f7baa8488b791b903d3da37ab01662
Bobby Georgescu [Wed, 19 Sep 2012 23:51:05 +0000 (16:51 -0700)]
Grid/filmstrip switching behavior improvements
Bug:
7200453
Bug:
7196483
Bug:
7222179
Bug:
7224619
Changes:
- Launch camera in capture even if paused in grid/filmstrip
- Fixed behavior of filmstrip button after launching grid
from camera
- Refresh bar timeouts after swiping a photo
- Partially swiping from camera to filmstrip without lifting
finger and then swiping back no longer results in unwanted
switch to filmstrip
- Removed hacky solution to switching to filmstrip mode
Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
Wu-cheng Li [Tue, 25 Sep 2012 10:20:04 +0000 (03:20 -0700)]
am
62e8403c: Add API check for "context" input port of effects recording.
* commit '
62e8403c69f4a82a4023651499a88f15eaa47fa5':
Add API check for "context" input port of effects recording.
Wu-cheng Li [Tue, 25 Sep 2012 10:00:51 +0000 (03:00 -0700)]
am
7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
* commit '
7c79f6cab19e60d887a42b03fb123bb0358141b5':
Add an unlock image in the end of secure album.
Wu-cheng Li [Tue, 25 Sep 2012 09:45:03 +0000 (17:45 +0800)]
Add API check for "context" input port of effects recording.
bug:
7106963
Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
Wu-cheng Li [Tue, 25 Sep 2012 09:59:17 +0000 (02:59 -0700)]
Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
Wu-cheng Li [Mon, 24 Sep 2012 10:32:59 +0000 (18:32 +0800)]
Add an unlock image in the end of secure album.
When camera is started from secure lock screen, put placeholder
"proto-photo" at the end of the camera roll. When it is clicked,
it takes the user to the lock screen.
bug:
7192331
Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
Pin Ting [Tue, 25 Sep 2012 08:41:21 +0000 (01:41 -0700)]
am
03f6fce6: Enable effects recording in JellyBean.
* commit '
03f6fce66de39b3578ac036557c1ec1aed729f61':
Enable effects recording in JellyBean.
Pin Ting [Tue, 25 Sep 2012 07:20:36 +0000 (15:20 +0800)]
Enable effects recording in JellyBean.
Bug:
7106963
Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
Wu-cheng Li [Tue, 25 Sep 2012 04:12:19 +0000 (21:12 -0700)]
am
5eff2242: Register secure image capture intent.
* commit '
5eff22421ad9bd7af8611e72d98c7ab71f842cb2':
Register secure image capture intent.
Wu-cheng Li [Tue, 25 Sep 2012 03:20:27 +0000 (11:20 +0800)]
Register secure image capture intent.
bug:
7225688
Change-Id: I22f0ee81a921b3ec811444c7d554f2400e6a5485
Michael Kolb [Tue, 25 Sep 2012 02:47:23 +0000 (19:47 -0700)]
am
f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
* commit '
f6a5c701d3fa41b93e12768e2456e993960321e6':
Remove old camera activity from launcher
Michael Kolb [Tue, 25 Sep 2012 02:45:46 +0000 (19:45 -0700)]
Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
Michael Kolb [Tue, 25 Sep 2012 02:42:34 +0000 (19:42 -0700)]
Remove old camera activity from launcher
Bug:
7201108
The old activity can still be started via:
adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera
Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa
Bobby Georgescu [Mon, 24 Sep 2012 21:34:54 +0000 (14:34 -0700)]
am
e06c9f10: Restore missing "Group by" option in camera roll grid view
* commit '
e06c9f109f06813ca1f8a0abb549d51aefd4973d':
Restore missing "Group by" option in camera roll grid view
Bobby Georgescu [Mon, 24 Sep 2012 19:20:30 +0000 (12:20 -0700)]
Restore missing "Group by" option in camera roll grid view
Bug:
7217410
Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
Bobby Georgescu [Mon, 24 Sep 2012 21:32:45 +0000 (14:32 -0700)]
am
3eb2e643: Fix occasional crash when restoring photo page state
* commit '
3eb2e643a40d1be77998373343cdf8b14764f58c':
Fix occasional crash when restoring photo page state
Bobby Georgescu [Mon, 24 Sep 2012 18:26:10 +0000 (11:26 -0700)]
Fix occasional crash when restoring photo page state
Bug:
7216012
If the saved state being used to restore the photo page
includes an out-of-bounds index, ignore it and reset the
index to 0.
Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
Teng-Hui Zhu [Mon, 24 Sep 2012 20:44:09 +0000 (13:44 -0700)]
am
15ff1b1c: The trimming solution with the mp4parser library.
* commit '
15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2':
The trimming solution with the mp4parser library.
Teng-Hui Zhu [Sun, 23 Sep 2012 22:02:56 +0000 (15:02 -0700)]
The trimming solution with the mp4parser library.
bug:
7093055
Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
Mangesh Ghiware [Mon, 24 Sep 2012 15:48:18 +0000 (08:48 -0700)]
am
4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas
* commit '
4f32d514ee7474d867d04bf3934f9e11e9e92783':
Use vendor specific MIME type for sharing LightCycle panoramas
Mangesh Ghiware [Mon, 24 Sep 2012 00:19:34 +0000 (17:19 -0700)]
Use vendor specific MIME type for sharing LightCycle panoramas
Bug:
7150324
Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
Doris Liu [Sat, 22 Sep 2012 05:44:42 +0000 (22:44 -0700)]
Making switchState public
Bug:
7208910
switchState was only accessible within package com.android.gallery3d.app . Now
changing it to public so that it can be called from camera. This is part 1 of 2
in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome.
Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
Baligh Uddin [Fri, 21 Sep 2012 22:01:37 +0000 (15:01 -0700)]
am
2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2267ac9fe59393a11034e4bcfa37b919492006fa':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 21 Sep 2012 22:01:21 +0000 (15:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 21 Sep 2012 22:00:41 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Fri, 21 Sep 2012 21:54:10 +0000 (14:54 -0700)]
am
9b270f4f: Snap a photo to the center after fling ends in filmstrip
* commit '
9b270f4f2e20fb0f0455529c2e20990173a75470':
Snap a photo to the center after fling ends in filmstrip