OSDN Git Service
Wei Huang [Tue, 29 May 2012 20:16:07 +0000 (13:16 -0700)]
am
20582d2f: am
f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
* commit '
20582d2f79f82f8a8529753194c863d1593ad08c':
Keep screen on for user-initiated slideshow.
Wei Huang [Tue, 29 May 2012 20:14:15 +0000 (13:14 -0700)]
am
f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
* commit '
f1f02b6ec5998102257f0c60d61b0b07df796064':
Keep screen on for user-initiated slideshow.
Wei Huang [Tue, 29 May 2012 20:11:12 +0000 (13:11 -0700)]
Merge "Keep screen on for user-initiated slideshow." into jb-dev
Eric Fischer [Tue, 29 May 2012 19:09:23 +0000 (12:09 -0700)]
am
601a18b3: (-s ours) am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
601a18b3d77a95e37585d051d8de2802bf3c84a4':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:08:08 +0000 (12:08 -0700)]
am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cde8d1762af242a89aeea6062b185e7717da5a62':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:06:01 +0000 (12:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 29 May 2012 18:56:21 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
Eric Fischer [Tue, 29 May 2012 18:55:56 +0000 (11:55 -0700)]
am
d31562a6: (-s ours) am
fd08e675: Import translations. DO NOT MERGE
* commit '
d31562a6fdccf6d1b37264c90a623b6c790e9241':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 18:51:57 +0000 (11:51 -0700)]
am
fd08e675: Import translations. DO NOT MERGE
* commit '
fd08e675f3d83594bb7e78577d40fea1537a4935':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 17:57:57 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c
Wei Huang [Tue, 29 May 2012 16:57:30 +0000 (09:57 -0700)]
am
0cb52a72: am
20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
* commit '
0cb52a7232d738a58010bed106472b27e0b2c002':
Fix over-sized images in drawable-sw600dp.
Wei Huang [Tue, 29 May 2012 16:54:41 +0000 (09:54 -0700)]
am
20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
* commit '
20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6':
Fix over-sized images in drawable-sw600dp.
Wei Huang [Tue, 29 May 2012 16:52:43 +0000 (09:52 -0700)]
Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
The Android Open Source Project [Tue, 29 May 2012 16:45:09 +0000 (09:45 -0700)]
am
7f950388: Reconcile with jb-release nakasi-factoryrom-release
* commit '
7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
The Android Open Source Project [Tue, 29 May 2012 16:41:17 +0000 (09:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
The Android Automerger [Tue, 29 May 2012 15:59:46 +0000 (08:59 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Mon, 28 May 2012 15:39:27 +0000 (23:39 +0800)]
Keep screen on for user-initiated slideshow.
Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f
b:
6450305
Hung-ying Tyan [Sat, 26 May 2012 00:17:22 +0000 (08:17 +0800)]
Fix over-sized images in drawable-sw600dp.
We have both drawable-sw600dp/ and drawable-sw600dp-mdpi/. We are getting
images from drawable-sw600dp/ and they are too large. Those over-sized images
are removed, and to avoid confusion, move the images in drawable-sw600dp-mdpi/
to drawable-sw600dp/.
Bug:
6549010
Change-Id: Ibd6dea8aec3740c4e6d5992ccdba3518fbb89a23
Owen Lin [Fri, 25 May 2012 23:45:21 +0000 (16:45 -0700)]
am
a563beee: am
00bb8e43: Add back the background when we show the action bar
* commit '
a563beeed8ab19d0960e6ce33503726dc6a2e398':
Add back the background when we show the action bar
Owen Lin [Fri, 25 May 2012 23:42:30 +0000 (16:42 -0700)]
am
00bb8e43: Add back the background when we show the action bar
* commit '
00bb8e439e33848d679a4404c203af9ed1a06a19':
Add back the background when we show the action bar
Owen Lin [Wed, 23 May 2012 22:47:36 +0000 (15:47 -0700)]
Add back the background when we show the action bar
This change fix the following UI issues:
1. We add a black backgorund when ActionBar shows and remove it
when we hide the action bar.
2. Make the postion of video stable when opening
3. Prevent glitching when opening a video
4. Make it really full-screen.
5. Hide ControlOverlay at begining.
bug:
6519765
bug:
6491674
Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
Eric Fischer [Fri, 25 May 2012 18:35:46 +0000 (11:35 -0700)]
am
f6688d1e: (-s ours) am
ceab9f07: Import translations. DO NOT MERGE
* commit '
f6688d1e099d79ff288dc14ee94e7ad2bcf1c470':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 18:32:39 +0000 (11:32 -0700)]
am
ceab9f07: Import translations. DO NOT MERGE
* commit '
ceab9f07470e899c2ff34d4ddd4a43395a9f6523':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 18:26:21 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie3efea4133d63aac5b1df887925b914b7107859d
Eric Fischer [Fri, 25 May 2012 18:26:03 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica289f7c9b3b9fcb792be31e2088300cd1d5ac92
Angus Kong [Fri, 25 May 2012 15:11:15 +0000 (08:11 -0700)]
am
903f8394: am
95c2aeab: Force to stop scrolling in filmstrip mode.
* commit '
903f83944aa056644373e8d0660bddf2861f0390':
Force to stop scrolling in filmstrip mode.
Angus Kong [Fri, 25 May 2012 15:08:28 +0000 (08:08 -0700)]
am
95c2aeab: Force to stop scrolling in filmstrip mode.
* commit '
95c2aeab0bf398b45d8a9c562fd110d1e3756139':
Force to stop scrolling in filmstrip mode.
Angus Kong [Thu, 24 May 2012 23:20:57 +0000 (16:20 -0700)]
Force to stop scrolling in filmstrip mode.
bug:
6554106
Change-Id: I4305ce7068a36e72a325996a88c1d227a2d2b20c
The Android Automerger [Thu, 24 May 2012 17:19:07 +0000 (10:19 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Thu, 24 May 2012 16:04:14 +0000 (09:04 -0700)]
am
fe1ade17: Reconcile with jb-release nakasi-factoryrom-release
* commit '
fe1ade179e5285178c691b5b397d59a8d927d0e4':
The Android Open Source Project [Thu, 24 May 2012 16:01:34 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
The Android Automerger [Thu, 24 May 2012 14:01:24 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
Christian Robertson [Wed, 23 May 2012 21:06:42 +0000 (14:06 -0700)]
am
0d7cd057: am
83bb96be: Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
* commit '
0d7cd0570cbe29c5f1f38d3d6ab88f4484913838':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 21:04:36 +0000 (14:04 -0700)]
am
83bb96be: Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
* commit '
83bb96be9e602ed81c03cbb48e20471ebb235d25':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 21:01:12 +0000 (14:01 -0700)]
Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
Christian Robertson [Wed, 23 May 2012 18:59:51 +0000 (11:59 -0700)]
Updating launcher icon to fix alignment. Bug:
6511716
Change-Id: Icf1ab8d7cce0217717db3044366280248e093a86
Wei Huang [Wed, 23 May 2012 18:05:21 +0000 (11:05 -0700)]
am
9c208d30: am
4608195e: Merge "Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:
6519765" into jb-dev
* commit '
9c208d30b74d23cf2e194054e76a7161e0fd0771':
Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:
6519765
Wei Huang [Wed, 23 May 2012 18:03:00 +0000 (11:03 -0700)]
am
4608195e: Merge "Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:
6519765" into jb-dev
* commit '
4608195e1c3f29a15fb61a8f3cd0797af9dbc938':
Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:
6519765
Yuli Huang [Wed, 23 May 2012 18:02:59 +0000 (11:02 -0700)]
am
e8340d42: am
2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
* commit '
e8340d42618e4595a20181517c8e49143e6d6d5d':
Back should progress through Gallery and return Home for widget intents.
Yuli Huang [Wed, 23 May 2012 18:00:39 +0000 (11:00 -0700)]
am
2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
* commit '
2ea599aee03d431af770fb39e83d7a93a66b2ac0':
Back should progress through Gallery and return Home for widget intents.
Wei Huang [Wed, 23 May 2012 18:00:01 +0000 (11:00 -0700)]
Merge "Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:
6519765" into jb-dev
Chih-Chung Chang [Wed, 23 May 2012 17:59:28 +0000 (10:59 -0700)]
am
aa8fecd7: am
835bc683: Merge "Remove the background in MovieActivity." into jb-dev
* commit '
aa8fecd75109807c8242a77d7563ec1cc138f92d':
Remove the background in MovieActivity.
Chih-Chung Chang [Wed, 23 May 2012 17:59:27 +0000 (10:59 -0700)]
am
8c33b5f9: am
6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev
* commit '
8c33b5f9782d95f6cc3b163485a2cc2c846ca74d':
Put a black View in front of SurfaceView.
Yuli Huang [Wed, 23 May 2012 17:58:11 +0000 (10:58 -0700)]
Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
Chih-Chung Chang [Wed, 23 May 2012 17:57:02 +0000 (10:57 -0700)]
am
835bc683: Merge "Remove the background in MovieActivity." into jb-dev
* commit '
835bc6835d42009999536f509ed1dd2f5359cf9b':
Remove the background in MovieActivity.
Chih-Chung Chang [Wed, 23 May 2012 17:57:01 +0000 (10:57 -0700)]
am
6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev
* commit '
6673c21275772af55c9ae72cd78cbbe710edc023':
Put a black View in front of SurfaceView.
Chih-Chung Chang [Wed, 23 May 2012 17:54:46 +0000 (10:54 -0700)]
Merge "Remove the background in MovieActivity." into jb-dev
Chih-Chung Chang [Wed, 23 May 2012 17:54:16 +0000 (10:54 -0700)]
Merge "Put a black View in front of SurfaceView." into jb-dev
The Android Automerger [Wed, 23 May 2012 14:03:50 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Tue, 22 May 2012 09:34:29 +0000 (17:34 +0800)]
Fix
6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode
b:
6519765
Ensure SYSTEM_UI_FLAG_LAYOUT_STABLE and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN is set in all states
so ActionBarOverlayLayout can response to fitSystemWindows and onSystemVisibilityChange correctly.
Change-Id: I41a33c9e7d21243bde6fa64e6cd1b709e7b04203
Yuli Huang [Wed, 23 May 2012 08:06:32 +0000 (16:06 +0800)]
Back should progress through Gallery and return Home for widget intents.
bug:
6384492
Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
Owen Lin [Tue, 22 May 2012 21:19:31 +0000 (14:19 -0700)]
Remove the background in MovieActivity.
This is a regression. We add the background for bug
6494653.
So we need to remove it in MovieActivity as well.
bug:
6491674
Change-Id: I6fb692fa778a1200ffbed741ca0996cb7eeef32f
Wei Huang [Wed, 23 May 2012 05:03:26 +0000 (22:03 -0700)]
am
390da9c5: am
13188c88: Merge "Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
* commit '
390da9c54201b3caddd26c60751fff9b103cd8eb':
Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
Wei Huang [Wed, 23 May 2012 05:00:47 +0000 (22:00 -0700)]
am
4dbce842: am
96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev
* commit '
4dbce8423245ff34c47178480d81587f0e27efbe':
Recycle textures when we don't need them.
Chih-Chung Chang [Wed, 23 May 2012 05:00:45 +0000 (22:00 -0700)]
am
c3114525: am
e6251df0: Unlock orientation only when action bar is needed.
* commit '
c3114525c778471e8946567aeb02535aec8a24a9':
Unlock orientation only when action bar is needed.
Wei Huang [Wed, 23 May 2012 04:59:43 +0000 (21:59 -0700)]
am
13188c88: Merge "Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
* commit '
13188c884a93f6086cbf4e860fb6dfcbc44c6e13':
Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
Chih-Chung Chang [Wed, 23 May 2012 04:26:36 +0000 (21:26 -0700)]
Put a black View in front of SurfaceView.
This prevents SurfaceView from being transparent before the first draw.
Bug:
6507478
Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
Wei Huang [Wed, 23 May 2012 04:57:00 +0000 (21:57 -0700)]
am
96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev
* commit '
96b012c84436c776fe515f7d70eb4f8f309ce38a':
Recycle textures when we don't need them.
Chih-Chung Chang [Wed, 23 May 2012 04:56:58 +0000 (21:56 -0700)]
am
e6251df0: Unlock orientation only when action bar is needed.
* commit '
e6251df06f0b3c8f556043f8b725b4b19be7474d':
Unlock orientation only when action bar is needed.
Wei Huang [Wed, 23 May 2012 04:56:46 +0000 (21:56 -0700)]
Merge "Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
Wei Huang [Wed, 23 May 2012 04:54:57 +0000 (21:54 -0700)]
Merge "Recycle textures when we don't need them." into jb-dev
Ray Chen [Thu, 17 May 2012 04:29:12 +0000 (12:29 +0800)]
Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
And removed sync error toast.
Bug:
6259517
Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
Chih-Chung Chang [Tue, 22 May 2012 18:35:46 +0000 (11:35 -0700)]
Unlock orientation only when action bar is needed.
Bug:
6482079
Change-Id: I75d96ca7957f80e9c52f35edf74127f82f194f63
Owen Lin [Tue, 22 May 2012 20:28:04 +0000 (13:28 -0700)]
Recycle textures when we don't need them.
bug:
6307447
Change-Id: Id0c1abab54e1fbb75364dffda9f1f72d6b39310b
Owen Lin [Tue, 22 May 2012 22:35:06 +0000 (15:35 -0700)]
Owen Lin [Tue, 22 May 2012 22:33:08 +0000 (15:33 -0700)]
Owen Lin [Tue, 22 May 2012 22:21:00 +0000 (15:21 -0700)]
Fix build.
Change-Id: Ied20eb41fcae52f40f319adb0fbbfad4d94e3019
Owen Lin [Tue, 22 May 2012 21:39:58 +0000 (14:39 -0700)]
am
22ec75f7: am
37c60594: Add a new state uploading to UploadedTexture.
* commit '
22ec75f7ab93636a21fc7549f9f64004875c9f51':
Add a new state uploading to UploadedTexture.
Owen Lin [Tue, 22 May 2012 21:37:55 +0000 (14:37 -0700)]
am
37c60594: Add a new state uploading to UploadedTexture.
* commit '
37c605949219b8bf54c165c34d6405f5f2989f50':
Add a new state uploading to UploadedTexture.
Chih-Chung Chang [Tue, 22 May 2012 21:31:10 +0000 (14:31 -0700)]
am
a2b4f8ba: am
e919bcff: Hide status bar in lights out mode.
* commit '
a2b4f8ba73013a3300470586f653ac55153c3304':
Hide status bar in lights out mode.
Owen Lin [Fri, 18 May 2012 18:30:26 +0000 (11:30 -0700)]
Add a new state uploading to UploadedTexture.
This state means the texture is being uploaded in background and should
not be drawn now to prevent janking.
Sometimes, we may lose GLContext and we will need to reupload
textures again. In this case, we would like to upload these texture in
foreground instead of using TextureUploader.
(for simplicity since this won't happen too often).
bug:
6519344
Change-Id: Ic5d7547c6a0eb4b044b79aa0eb4eb52397faac03
Chih-Chung Chang [Tue, 22 May 2012 21:27:59 +0000 (14:27 -0700)]
am
e919bcff: Hide status bar in lights out mode.
* commit '
e919bcff63e898d53869725a979cdfd01ef92b08':
Hide status bar in lights out mode.
The Android Open Source Project [Tue, 22 May 2012 21:21:34 +0000 (14:21 -0700)]
am
4bbf4952: Reconcile with jb-release
* commit '
4bbf4952c6cf747f4151917fe0ecdd9800c4168d':
Limit the size of a ScreenNail.
Owen Lin [Tue, 22 May 2012 21:20:26 +0000 (14:20 -0700)]
am
60728ce6: am
c2c0b01f: Reuse bitmap to prevent GC in TiledImageView.
* commit '
60728ce686325511615983f6a047da65445a247a':
Reuse bitmap to prevent GC in TiledImageView.
The Android Automerger [Tue, 22 May 2012 20:25:07 +0000 (13:25 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:06:49 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
Owen Lin [Mon, 21 May 2012 23:52:25 +0000 (16:52 -0700)]
Limit the size of a ScreenNail.
bug:
6528366
This bug was happened because we are trying to make a texture beyond the
max size allowed in GL.
Here is what we do in this CL:
1. Limit the size of a screen nail
2. Print warning message, if we try to allocate a texture beyond the size
3. Don't show fall-back animation if the image is not loaded yet.
Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
Owen Lin [Tue, 22 May 2012 18:57:57 +0000 (11:57 -0700)]
am
c2c0b01f: Reuse bitmap to prevent GC in TiledImageView.
* commit '
c2c0b01fbbf243eee1a11c33ba6dd1ce918a9ce5':
Reuse bitmap to prevent GC in TiledImageView.
Chih-Chung Chang [Tue, 22 May 2012 02:22:51 +0000 (19:22 -0700)]
Hide status bar in lights out mode.
Bug:
6451200
Change-Id: I6ad5ffc203fd8e6be9191ba13a4a99eb716c4734
Owen Lin [Thu, 17 May 2012 22:59:25 +0000 (15:59 -0700)]
Reuse bitmap to prevent GC in TiledImageView.
bug:
5948093
Change-Id: Iad89c5809bde0de5409752330f607aab153dceba
Owen Lin [Tue, 22 May 2012 18:10:53 +0000 (11:10 -0700)]
am
4176af0d: am
49affdc4: Limit the size of a ScreenNail.
* commit '
4176af0db4721e95c185617fe89b686c0c833348':
Limit the size of a ScreenNail.
Owen Lin [Tue, 22 May 2012 18:06:00 +0000 (11:06 -0700)]
am
49affdc4: Limit the size of a ScreenNail.
* commit '
49affdc4e274098a34e4eb2dbe4a89a750f1ba7f':
Limit the size of a ScreenNail.
Owen Lin [Mon, 21 May 2012 23:52:25 +0000 (16:52 -0700)]
Limit the size of a ScreenNail.
bug:
6528366
This bug was happened because we are trying to make a texture beyond the
max size allowed in GL.
Here is what we do in this CL:
1. Limit the size of a screen nail
2. Print warning message, if we try to allocate a texture beyond the size
3. Don't show fall-back animation if the image is not loaded yet.
Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
The Android Automerger [Tue, 22 May 2012 14:06:38 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Tue, 22 May 2012 06:30:40 +0000 (23:30 -0700)]
am
09cb288a: am
21c2e665: Fix
6360834 Select All is shown in place of Deselect all option
* commit '
09cb288a8dfc9cc2b2b451188b5755a144108e90':
Fix
6360834 Select All is shown in place of Deselect all option
Ray Chen [Tue, 22 May 2012 06:28:19 +0000 (23:28 -0700)]
am
21c2e665: Fix
6360834 Select All is shown in place of Deselect all option
* commit '
21c2e665fdc1d1af0c91ab9c104d13fb7dc2444e':
Fix
6360834 Select All is shown in place of Deselect all option
Ray Chen [Thu, 3 May 2012 05:10:51 +0000 (13:10 +0800)]
Fix
6360834 Select All is shown in place of Deselect all option
The CL changes the SelectionManager's toggle method so it changes itself to
inverse selection mode when all items are already selected, and onSelectionModeChange
will be triggered so the listener can update the selection menu (Select all/Deselect all)
and ActionBar.
Change-Id: I9aa5507067415e52f6800c254ecb4d68e7395ffa
b:
6360834
Chih-Chung Chang [Tue, 22 May 2012 00:29:56 +0000 (17:29 -0700)]
am
55d2ae71: am
3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev
* commit '
55d2ae71bed1db01098254d5404cc0187d51dcb5':
Don't fire data change notification before the data is made consistent.
Chih-Chung Chang [Tue, 22 May 2012 00:29:54 +0000 (17:29 -0700)]
am
3ebf7dd4: am
7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
* commit '
3ebf7dd4a88576187fea4f77164f2b25bcb40efc':
Fix capture animation if we are far away from the camera preview.
Chih-Chung Chang [Tue, 22 May 2012 00:27:17 +0000 (17:27 -0700)]
am
3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev
* commit '
3efc2b24e29f7591993c43ef2653332054203578':
Don't fire data change notification before the data is made consistent.
Chih-Chung Chang [Tue, 22 May 2012 00:27:15 +0000 (17:27 -0700)]
am
7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
* commit '
7a836b5ad59be5b122cbbacaa3a1882d4a791355':
Fix capture animation if we are far away from the camera preview.
Chih-Chung Chang [Tue, 22 May 2012 00:24:55 +0000 (17:24 -0700)]
Merge "Don't fire data change notification before the data is made consistent." into jb-dev
Chih-Chung Chang [Tue, 22 May 2012 00:24:45 +0000 (17:24 -0700)]
Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
Wei Huang [Mon, 21 May 2012 21:32:16 +0000 (14:32 -0700)]
am
1f868ff7: am
d7ebcd2f: Merge "Fix
6513486: Extend char limit from 30 to 50. b:
6513486" into jb-dev
* commit '
1f868ff7b18a931e5a8a70ca4b6be6face74eacb':
Fix
6513486: Extend char limit from 30 to 50. b:
6513486
Wei Huang [Mon, 21 May 2012 21:32:15 +0000 (14:32 -0700)]
am
8d403845: am
614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev
* commit '
8d403845b68b6cb78431e72b611f03d55d706b37':
Fix the detail isn't updated for the selected thumbnail.
Ray Chen [Mon, 21 May 2012 21:32:15 +0000 (14:32 -0700)]
am
a8b132f3: am
a3871050: Fix
6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
* commit '
a8b132f30f87356b83e6caed8372b65abb7caf08':
Fix
6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
The Android Open Source Project [Mon, 21 May 2012 21:28:52 +0000 (14:28 -0700)]
am
aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release
* commit '
aaaeabd6a655068605747ad492ddb0ee128d1c36':
Fix a NPE found by Moneky.
Fix a dead lock while we freeze the screen.
Restore deleted string still referenced from menu resource.
Chih-Chung Chang [Mon, 21 May 2012 20:44:36 +0000 (13:44 -0700)]
Don't fire data change notification before the data is made consistent.
Bug:
6500467
Change-Id: Ia064461daba92bbf1172eae5d321bf5049de6d48
Wei Huang [Mon, 21 May 2012 20:01:07 +0000 (13:01 -0700)]
am
d7ebcd2f: Merge "Fix
6513486: Extend char limit from 30 to 50. b:
6513486" into jb-dev
* commit '
d7ebcd2fef383f0a68b6af40e15bee81f3ec5c4b':
Fix
6513486: Extend char limit from 30 to 50. b:
6513486
Wei Huang [Mon, 21 May 2012 20:01:01 +0000 (13:01 -0700)]
am
614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev
* commit '
614fe145f539119084b4cf0b1d6892bfcded1a0b':
Fix the detail isn't updated for the selected thumbnail.