OSDN Git Service
Ray Chen [Thu, 15 Mar 2012 00:47:31 +0000 (17:47 -0700)]
Merge "Fix
5406844 Category switcher does not highlight current selection"
Owen Lin [Wed, 14 Mar 2012 09:27:24 +0000 (17:27 +0800)]
Reorganize import for all files.
Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
Yuli Huang [Mon, 12 Mar 2012 08:34:41 +0000 (16:34 +0800)]
Simplify PhotoEditor code.
1. Encapsulate spinner usages inside Toolbar.
2. Remove unnecessary static variable usages.
Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
Eric Fischer [Mon, 12 Mar 2012 18:51:15 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d
Ray Chen [Mon, 12 Mar 2012 13:34:25 +0000 (21:34 +0800)]
Fix
5406844 Category switcher does not highlight current selection
Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d
Chih-Chung Chang [Mon, 12 Mar 2012 04:46:25 +0000 (12:46 +0800)]
Change id "root" to "movie_view_root" to avoid confusion.
There is also one id "root" in Camera.
Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
Eric Fischer [Wed, 7 Mar 2012 19:12:06 +0000 (11:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93
Yuli Huang [Tue, 6 Mar 2012 17:18:08 +0000 (01:18 +0800)]
Fix b/
5885342: Multiple PhotoEditor activities cause exceptions.
Avoid using a static variable to keep tracking views across activities.
Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
Eric Fischer [Tue, 28 Feb 2012 19:11:26 +0000 (11:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9
Eric Fischer [Mon, 27 Feb 2012 20:21:35 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf31034a533999342bf2452f2e66b6cc0ae4dd7c
Ray Chen [Fri, 17 Feb 2012 04:40:44 +0000 (12:40 +0800)]
Fix
5948410 BUG BASH: Temporarily title is displayed during gallery start
Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
Chih-Chung Chang [Fri, 17 Feb 2012 02:02:27 +0000 (10:02 +0800)]
Cache animation time value to reduce work and synchronize animation.
Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
The Android Open Source Project [Thu, 16 Feb 2012 19:25:39 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:23 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)]
am
aa5bdb1a: Reconcile with ics-mr1-release
* commit '
aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a
The Android Open Source Project [Thu, 16 Feb 2012 18:06:44 +0000 (10:06 -0800)]
am
5e73e2dc: Reconcile with ics-mr1-release
* commit '
5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b
Chih-Chung Chang [Wed, 15 Feb 2012 23:27:03 +0000 (07:27 +0800)]
Make GLCanvas a bit faster.
(1) make a faster version of translate(x, y).
(2) make mapPoints() faster.
(3) avoid calling canvas.rotate() when it is not needed.
Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
The Android Automerger [Tue, 14 Feb 2012 22:16:37 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 14 Feb 2012 21:18:04 +0000 (13:18 -0800)]
Import translations.
Change-Id: I958b1d3318cbf5a8840ba8053ac748f1d96a7eff
Justin Ho [Fri, 10 Feb 2012 18:25:00 +0000 (10:25 -0800)]
am
164bd217: am
35659b2c: (-s ours) am
70992e04: (-s ours) am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
164bd217f574f68e9f3b03ed59b34842cacf4ca5':
Justin Ho [Fri, 10 Feb 2012 18:19:59 +0000 (10:19 -0800)]
am
35659b2c: (-s ours) am
70992e04: (-s ours) am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
35659b2c06a70381b462f1e7029eda13aa5e97d6':
Justin Ho [Fri, 10 Feb 2012 18:18:10 +0000 (10:18 -0800)]
am
b09b9bd0: am
c2bc46ea: (-s ours) am
4e1e57fd: am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
b09b9bd0af11a5985c8854e9161c8e0a9637486f':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:18:09 +0000 (10:18 -0800)]
am
c2661be5: am
ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
* commit '
c2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5':
Eric Fischer [Fri, 10 Feb 2012 18:15:47 +0000 (10:15 -0800)]
am
d46c2b12: am
4707351e: (-s ours) am
3293fee0: am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
d46c2b121f0f544d186e0ecd55a2e492bbd7465f':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)]
am
c2bc46ea: (-s ours) am
4e1e57fd: am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:15:24 +0000 (10:15 -0800)]
am
ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
* commit '
ee7512d63a1ea117b7655f28ea30bcb1d8cb151d':
Justin Ho [Fri, 10 Feb 2012 18:13:20 +0000 (10:13 -0800)]
am
70992e04: (-s ours) am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
70992e04d00e6708d33adbb7c016499b6e030d68':
Eric Fischer [Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)]
am
4707351e: (-s ours) am
3293fee0: am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
4707351e0baec6326e6c74b5c184a66552929c3b':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:55 +0000 (10:10 -0800)]
am
4e1e57fd: am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
4e1e57fdba6999cb46f1f72eb529ffbb68be83a6':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:34 +0000 (10:09 -0800)]
am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
a64072a481580cbe3f3166f0c6d4424b20f1275c':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:08:47 +0000 (10:08 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
Eric Fischer [Fri, 10 Feb 2012 18:08:29 +0000 (10:08 -0800)]
am
3f9bc412: (-s ours) am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
3f9bc4128e2f59cef855863dcb71de5d0ecaf69b':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:08:14 +0000 (10:08 -0800)]
am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
a64072a481580cbe3f3166f0c6d4424b20f1275c':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:06:24 +0000 (10:06 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 10 Feb 2012 18:05:40 +0000 (10:05 -0800)]
am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:09 +0000 (10:05 -0800)]
am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
Import translations. DO NOT MERGE
Yuli Huang [Thu, 9 Feb 2012 07:58:57 +0000 (23:58 -0800)]
am
f948355d: Merge "Fix b/
5974663: inconsistent transparency of disabled action buttons."
* commit '
f948355db86dde8531088d49c69a4ac0a5d1231e':
Fix b/
5974663: inconsistent transparency of disabled action buttons.
Yuli Huang [Thu, 9 Feb 2012 07:57:11 +0000 (23:57 -0800)]
Merge "Fix b/
5974663: inconsistent transparency of disabled action buttons."
Yuli Huang [Thu, 9 Feb 2012 07:21:40 +0000 (15:21 +0800)]
Fix b/
5974663: inconsistent transparency of disabled action buttons.
1. Avoid gray out save-button again as disabled alpha is already applied
to all text buttons.
2. Reduce disabled alpha of image buttons to make them look consistent
with text buttons.
Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
Eric Fischer [Thu, 9 Feb 2012 02:34:03 +0000 (18:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied427c7a1b1e87e666b170a5aa533c638bab97a3
Eric Fischer [Thu, 9 Feb 2012 02:08:34 +0000 (18:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d1ba410c706ae3d540af1b1b8cdf260ceb517eb
Eric Fischer [Wed, 8 Feb 2012 21:13:14 +0000 (13:13 -0800)]
am
25a69159: Import translations. DO NOT MERGE
* commit '
25a6915956887a33b60b848584176c2bc6845479':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 8 Feb 2012 21:06:28 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib49ea69bac5f27840a1e542a5e0946c09a1d264c
Eric Fischer [Wed, 8 Feb 2012 21:06:10 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf23634c1451bbfbd2e2bc815977b1a4dc7d8740
Eric Fischer [Tue, 7 Feb 2012 18:36:16 +0000 (10:36 -0800)]
am
88c7a253: Import translations. DO NOT MERGE
* commit '
88c7a253f83302d57f7fafdd74a0021e59e9454f':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 7 Feb 2012 18:32:33 +0000 (10:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic559edd4271ee14e03a8435c4b52232e18e68d3b
Eric Fischer [Tue, 7 Feb 2012 18:32:15 +0000 (10:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ba481021ed7c70fdca6c53be64e0109be004fea
Eric Fischer [Mon, 6 Feb 2012 20:49:23 +0000 (12:49 -0800)]
am
e69eba09: Import translations. DO NOT MERGE
* commit '
e69eba096c3c88e944471499ca7bb47cf77d3e3c':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:11:02 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia770f26d04147c896cf3a6af0f2a2a5eabe23694
Eric Fischer [Mon, 6 Feb 2012 20:10:46 +0000 (12:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie1f921dd8f676760bb776fa4201b2c9c4d2fbd11
Pin Ting [Mon, 6 Feb 2012 06:26:07 +0000 (22:26 -0800)]
am
acd15c73: Merge "Shows status bar in gallery when in portrait view."
* commit '
acd15c734363293975b259168537ed811889fcdc':
Shows status bar in gallery when in portrait view.
Pin Ting [Mon, 6 Feb 2012 06:24:13 +0000 (22:24 -0800)]
Merge "Shows status bar in gallery when in portrait view."
Pin Ting [Fri, 3 Feb 2012 10:35:00 +0000 (18:35 +0800)]
Shows status bar in gallery when in portrait view.
bug:
5467810
Shows status bar in gallery, crop activity, picker activity when in
portrait view; hide status bar when in landscape view.
Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
Eric Fischer [Fri, 3 Feb 2012 20:03:49 +0000 (12:03 -0800)]
am
2dea7258: Import translations. DO NOT MERGE
* commit '
2dea725878d947401d13a6ce9cd3f620cabdd075':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 19:59:47 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35f3f1aa3dac1e55f3e15edbdf9b426d9967bb4f
Eric Fischer [Fri, 3 Feb 2012 19:59:30 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia25a1b5ebc12306a5bea1f8bc70dc8aef12016d6
Ray Chen [Fri, 3 Feb 2012 08:10:57 +0000 (00:10 -0800)]
am
1e32e279: Fix
5658975 Gallery has \'CROP\' instead of \'SAVE\' or \'OK\' while setting the picture as wallpaper
* commit '
1e32e279f272392d61bc29aa31687c173071cdf0':
Fix
5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
Ray Chen [Fri, 3 Feb 2012 03:07:50 +0000 (11:07 +0800)]
Fix
5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
Change-Id: I520d760df2932f6dcb318c1362f15b82b044bcb3
Eric Fischer [Thu, 2 Feb 2012 20:12:14 +0000 (12:12 -0800)]
am
26e78b45: Import translations. DO NOT MERGE
* commit '
26e78b45e25c069b3a4d6ca45748c61cdc0df3a9':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:05:26 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f
Eric Fischer [Thu, 2 Feb 2012 20:05:08 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I997af10112474228ed5e1ff9a9b0b3000b026081
Chih-Chung Chang [Wed, 1 Feb 2012 10:40:57 +0000 (18:40 +0800)]
Localize the "fail to load image" toast message.
Bug
5875813.
Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
Eric Fischer [Tue, 31 Jan 2012 19:14:48 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c
Eric Fischer [Mon, 30 Jan 2012 22:50:09 +0000 (14:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9
Eric Fischer [Thu, 26 Jan 2012 22:08:45 +0000 (14:08 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 26 Jan 2012 22:08:32 +0000 (14:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a
Eric Fischer [Thu, 26 Jan 2012 21:45:09 +0000 (13:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df
Eric Fischer [Thu, 29 Dec 2011 20:18:49 +0000 (12:18 -0800)]
Import revised translations.
Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31
Owen Lin [Mon, 12 Dec 2011 07:07:28 +0000 (15:07 +0800)]
Make sure the backgroud is cleared in MovieActivity.
Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d
fix:
5742974
Yuli Huang [Fri, 2 Dec 2011 11:55:05 +0000 (19:55 +0800)]
Simplify EffectAction.
1. Make the whole effect item clickable instead of just the icon.
2. Rename interfaces/methods to improve readability.
Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
Yuli Huang [Fri, 2 Dec 2011 08:09:00 +0000 (00:09 -0800)]
Merge "Refactor to remove obsolete design and improve code consistency."
Yuli Huang [Mon, 28 Nov 2011 12:05:27 +0000 (20:05 +0800)]
Refactor to remove obsolete design and improve code consistency.
1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.
Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
The Android Open Source Project [Wed, 30 Nov 2011 20:56:14 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
The Android Automerger [Wed, 30 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:30:39 +0000 (13:30 -0800)]
am
4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
4e94e8858fc3187ec0eae83c70698c85115a630e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
Eric Fischer [Tue, 29 Nov 2011 19:04:51 +0000 (11:04 -0800)]
Import revised translations.
Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
The Android Automerger [Mon, 28 Nov 2011 20:22:56 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:11 +0000 (21:08 -0800)]
am
f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
f36d8f299d57849a1afb1b0c271bb4be0d336e43':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
The Android Automerger [Thu, 17 Nov 2011 14:47:04 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:46 +0000 (05:45 -0800)]
am
612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
612e9d697269cff5437366ae386dea7d6af6656c':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
The Android Automerger [Wed, 16 Nov 2011 14:46:48 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 15 Nov 2011 21:11:10 +0000 (13:11 -0800)]
am
8ab8a64c: (-s ours) am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
8ab8a64cc40a683d364829aad404fea4548cbd48':
Import revised translations. DO NOT MERGE
Yuli Huang [Tue, 15 Nov 2011 21:06:55 +0000 (13:06 -0800)]
am
c5d42ff7: Merge "Fix b/
5517002 by dismissing running progress dialog in onPause()." into ics-mr1
* commit '
c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/
5517002 by dismissing running progress dialog in onPause().
Eric Fischer [Tue, 15 Nov 2011 20:19:48 +0000 (12:19 -0800)]
am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
756f9bc72468a6fba926602b86525aed7bb05b40':
Import revised translations. DO NOT MERGE
Yuli Huang [Mon, 14 Nov 2011 14:38:16 +0000 (22:38 +0800)]
Fix b/
5517002 by dismissing running progress dialog in onPause().
Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
Eric Fischer [Mon, 14 Nov 2011 21:32:51 +0000 (13:32 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2
The Android Automerger [Sun, 13 Nov 2011 14:47:17 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Fri, 11 Nov 2011 19:48:32 +0000 (11:48 -0800)]
am
c9af80a1: Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
* commit '
c9af80a1e46106b93271903753d36682b480479c':
Fix
5213252 [UI] Updated action bar layouts and action orders
Ray Chen [Fri, 11 Nov 2011 07:33:43 +0000 (23:33 -0800)]
Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
Yuli Huang [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am
e193bc40: Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
* commit '
e193bc40110b0606806c864234e95141be6bd312':
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Eric Fischer [Thu, 10 Nov 2011 23:01:57 +0000 (15:01 -0800)]
Merge "Import revised translations."
The Android Open Source Project [Thu, 10 Nov 2011 22:36:29 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
Eric Fischer [Thu, 10 Nov 2011 22:12:56 +0000 (14:12 -0800)]
Import revised translations.
Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf
Ray Chen [Wed, 9 Nov 2011 02:49:09 +0000 (10:49 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
OSDN Git Service
