OSDN Git Service
Michael Kolb [Thu, 9 May 2013 00:02:15 +0000 (17:02 -0700)]
am
c3ec037f: am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
c3ec037ffa27fb45e1bbf8ba9d08da22a6979920':
Add drop shadow to preview thumb
Michael Kolb [Thu, 9 May 2013 00:00:00 +0000 (17:00 -0700)]
am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb
Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]
Add drop shadow to preview thumb
Bug:
8826241
Also, remove animateSlide blocker, it caused frozen review
Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
Sascha Haeberling [Wed, 8 May 2013 22:17:52 +0000 (15:17 -0700)]
am
b51819ba: am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
b51819ba4e1690aa43ba112be707220414e44f3b':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:15:30 +0000 (15:15 -0700)]
am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:36:59 +0000 (14:36 -0700)]
am
17b4b977: am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
17b4b977fad36b1b943cafef043e02c707844c97':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:32:20 +0000 (14:32 -0700)]
am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 18:14:35 +0000 (11:14 -0700)]
Fix second level menu
Bug:
8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
Sascha Haeberling [Wed, 8 May 2013 21:00:42 +0000 (14:00 -0700)]
Reduce max size of bitmap returned by crop dialog.
Bug:
8851336
Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
Angus Kong [Wed, 8 May 2013 20:39:17 +0000 (13:39 -0700)]
am
50e22843: Merge "Further assets clean up." into jb-mr2-dev
* commit '
50e2284308089c4ad0e7a9fbef1ac0cdb1caddf2':
Further assets clean up.
Angus Kong [Wed, 8 May 2013 20:34:24 +0000 (20:34 +0000)]
Merge "Further assets clean up." into jb-mr2-dev
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Angus Kong [Wed, 8 May 2013 18:21:01 +0000 (11:21 -0700)]
am
fafd8bbc: am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
fafd8bbcc3b33539ccd7ee4e6d69f31aede3b1e7':
DO NOT MERGE Further assets clean up.
Bobby Georgescu [Wed, 8 May 2013 18:20:56 +0000 (11:20 -0700)]
am
b45e0eab: am
9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '
b45e0eab05a503c53ff8ad9f2213abe64acf5d3e':
Fix memory leak in SparseArrayBitmapPool
Angus Kong [Wed, 8 May 2013 18:17:43 +0000 (11:17 -0700)]
am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
188ad6eda97b4e05853d582198722e70f9e03705':
DO NOT MERGE Further assets clean up.
Angus Kong [Wed, 8 May 2013 18:09:44 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
Bobby Georgescu [Wed, 8 May 2013 17:50:29 +0000 (10:50 -0700)]
am
9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '
9fcabfb535f9e094f77cbdba5305d04209adc0b3':
Fix memory leak in SparseArrayBitmapPool
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
DO NOT MERGE Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Bobby Georgescu [Wed, 8 May 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 7 May 2013 23:41:04 +0000 (16:41 -0700)]
Fix memory leak in SparseArrayBitmapPool
Bug:
8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
Doris Liu [Wed, 8 May 2013 00:33:27 +0000 (17:33 -0700)]
am
ca83651a: am
b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit '
ca83651a7fd9244682d340e4af2c6f52f5ba80ed':
Fix video capture intent overlapping buttons
Michael Kolb [Wed, 8 May 2013 00:33:24 +0000 (17:33 -0700)]
am
dcd90240: am
0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '
dcd90240d4723c2c2305c0a9c0fca2790fccfeeb':
Add animation to slice selection
Michael Kolb [Wed, 8 May 2013 00:33:22 +0000 (17:33 -0700)]
am
7174d685: am
9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
* commit '
7174d6857e992f3abafdda968a1053725f65a28c':
Remove unused assets
Doris Liu [Wed, 8 May 2013 00:29:12 +0000 (17:29 -0700)]
am
b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit '
b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
Fix video capture intent overlapping buttons
Doris Liu [Wed, 8 May 2013 00:27:28 +0000 (00:27 +0000)]
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:26:05 +0000 (17:26 -0700)]
am
0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '
0a830ce4b5424ff9919b9156eb0635e671a67a81':
Add animation to slice selection
Michael Kolb [Wed, 8 May 2013 00:23:40 +0000 (00:23 +0000)]
Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:22:56 +0000 (17:22 -0700)]
am
9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
* commit '
9a26f823b2894d3decf47b28ee10d08932b09adf':
Remove unused assets
Michael Kolb [Wed, 8 May 2013 00:20:44 +0000 (00:20 +0000)]
Merge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 22:58:47 +0000 (15:58 -0700)]
Remove unused assets
Bug:
8656481
Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
Sascha Haeberling [Tue, 7 May 2013 22:16:11 +0000 (15:16 -0700)]
am
a8e0de46: am
6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '
a8e0de46eea85c30f4817f2c2517d061d12ba994':
Avoid rounding errors from cropping uncropped images.
Doris Liu [Tue, 7 May 2013 20:48:10 +0000 (13:48 -0700)]
Fix video capture intent overlapping buttons
Bug:
8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
Sascha Haeberling [Tue, 7 May 2013 22:10:36 +0000 (15:10 -0700)]
am
6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '
6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
Sascha Haeberling [Tue, 7 May 2013 22:08:31 +0000 (22:08 +0000)]
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 20:53:19 +0000 (13:53 -0700)]
Add animation to slice selection
Bug:
8826233
Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
Michael Kolb [Tue, 7 May 2013 20:30:50 +0000 (13:30 -0700)]
am
d7ec31f0: am
48ce39b8: Fix review button placement
* commit '
d7ec31f066c8de6ad28cebfe7e6bd7d41bda8532':
Fix review button placement
Michael Kolb [Tue, 7 May 2013 20:28:20 +0000 (13:28 -0700)]
am
48ce39b8: Fix review button placement
* commit '
48ce39b881f60fde8c9a1536199980c31d38188c':
Fix review button placement
Michael Kolb [Mon, 6 May 2013 23:14:09 +0000 (16:14 -0700)]
Fix review button placement
Bug:
8833788
Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
Sascha Haeberling [Tue, 7 May 2013 18:04:08 +0000 (11:04 -0700)]
Avoid rounding errors from cropping uncropped images.
Bug:
8736111
Also don't treat "none" as a non-modifying filter.
Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
Doris Liu [Tue, 7 May 2013 17:11:58 +0000 (10:11 -0700)]
am
dec72c89: am
ed1224f1: Resize children to avoid laying out outside parent
* commit '
dec72c898e34f01ea2ffda1a6614b0bdcb719933':
Resize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 17:07:57 +0000 (10:07 -0700)]
am
ed1224f1: Resize children to avoid laying out outside parent
* commit '
ed1224f1b98a1a534f5a3b18739465ed6114529a':
Resize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 01:30:30 +0000 (18:30 -0700)]
Resize children to avoid laying out outside parent
Bug:
8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
Elliott Hughes [Mon, 6 May 2013 21:16:44 +0000 (14:16 -0700)]
resolved conflicts for merge of
f959df75 to jb-mr2-dev-plus-aosp
Change-Id: Ic56346cb59b2817482c3c33a2bcd1d552dd432da
George Mount [Mon, 6 May 2013 20:43:38 +0000 (13:43 -0700)]
am
6c14823c: am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
6c14823c50bbfdb1765a9b5987bee8d83882eece':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:41:42 +0000 (13:41 -0700)]
am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
08d2c51392978383699aedcf63d24e5122b3b7a5':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
Elliott Hughes [Mon, 6 May 2013 20:34:03 +0000 (20:34 +0000)]
Merge "Someone's IDE chose the wrong Date."
Michael Kolb [Mon, 6 May 2013 20:29:41 +0000 (13:29 -0700)]
am
90ca6d6b: am
ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
* commit '
90ca6d6b065dbda8fd234c34d49649305e965f85':
Fix lockscreen camera widget layout
Michael Kolb [Mon, 6 May 2013 20:22:34 +0000 (13:22 -0700)]
am
ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
* commit '
ea75136ae4abf55070644e5a048cf44323517c43':
Fix lockscreen camera widget layout
Michael Kolb [Mon, 6 May 2013 20:21:19 +0000 (20:21 +0000)]
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 19:41:34 +0000 (12:41 -0700)]
Fix lockscreen camera widget layout
Bug:
8832891
Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
Elliott Hughes [Mon, 6 May 2013 18:15:43 +0000 (11:15 -0700)]
Someone's IDE chose the wrong Date.
Part 2 of the mystery of the java.sql.Date in preloaded-classes solved.
Change-Id: If819d89d1cb7ac015adee7a39a6fda963c6a1022
Doris Liu [Mon, 6 May 2013 18:12:06 +0000 (11:12 -0700)]
am
59ad838a: am
3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
* commit '
59ad838a9431bc2dea1bddcb18ea68b506148f81':
Restrict checking for device flip
Michael Kolb [Mon, 6 May 2013 18:12:03 +0000 (11:12 -0700)]
am
e7fa2f0d: am
1e3bc7d4: Set correct label text in tap mode
* commit '
e7fa2f0df420e43a524b7ed726eee82216e03ba4':
Set correct label text in tap mode
Baligh Uddin [Mon, 6 May 2013 18:11:31 +0000 (11:11 -0700)]
am
d5edf6b9: am
49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
d5edf6b996a21a88321e5db06581426f1234cc6a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 May 2013 18:11:30 +0000 (11:11 -0700)]
am
228e200c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
228e200c8c63060696b331c5c4a8d2032932e3f6':
Import translations. DO NOT MERGE
Doris Liu [Mon, 6 May 2013 17:25:07 +0000 (10:25 -0700)]
am
3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
* commit '
3a50eb36cf760ddb2a11c72b247f96611f3bf112':
Restrict checking for device flip
Doris Liu [Mon, 6 May 2013 17:23:09 +0000 (17:23 +0000)]
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
George Mount [Mon, 6 May 2013 17:06:53 +0000 (10:06 -0700)]
Fix black background on save progress indicator.
Bug
8802092
Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
Michael Kolb [Mon, 6 May 2013 16:59:59 +0000 (09:59 -0700)]
am
1e3bc7d4: Set correct label text in tap mode
* commit '
1e3bc7d4873dbc0778d5e12333c73c00bcd6512f':
Set correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 15:49:10 +0000 (08:49 -0700)]
Set correct label text in tap mode
Bug:
8826229
Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
Doris Liu [Mon, 6 May 2013 15:44:41 +0000 (08:44 -0700)]
am
cdbac140: am
cd0fb7af: Fix NPE caused by insets never being set
* commit '
cdbac140d0530b7b8928302ab75a2d0febb8121c':
Fix NPE caused by insets never being set
Baligh Uddin [Sat, 4 May 2013 23:18:09 +0000 (16:18 -0700)]
am
49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
49a242256761f990001c3f81c54e4897f58ebc36':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 4 May 2013 23:16:41 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 4 May 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 21:33:57 +0000 (14:33 -0700)]
Restrict checking for device flip
Bug:
8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
Baligh Uddin [Fri, 3 May 2013 20:37:04 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f2979b6c91ecc068535ee41324c637237421fa6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 3 May 2013 20:36:23 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb
Auto-generated-cl: translation import
Doris Liu [Fri, 3 May 2013 20:02:15 +0000 (13:02 -0700)]
am
cd0fb7af: Fix NPE caused by insets never being set
* commit '
cd0fb7af20f855e1190122467c5650e46bfe820c':
Fix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 18:44:45 +0000 (11:44 -0700)]
Fix NPE caused by insets never being set
Bug:
8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
Doris Liu [Fri, 3 May 2013 18:19:23 +0000 (11:19 -0700)]
am
919d2153: am
4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
* commit '
919d2153a938ff5a59ac55ea890127dcba4b947a':
Anchor camera controls when flipping device
Angus Kong [Fri, 3 May 2013 18:19:17 +0000 (11:19 -0700)]
am
432e24c0: am
b0a1e9fe: Don\'t show settings when popup is shown.
* commit '
432e24c090c8208dd379188d3226c34638cc3057':
Don't show settings when popup is shown.
Doris Liu [Fri, 3 May 2013 18:10:57 +0000 (11:10 -0700)]
am
4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
* commit '
4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc':
Anchor camera controls when flipping device
Doris Liu [Fri, 3 May 2013 18:09:49 +0000 (18:09 +0000)]
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
Angus Kong [Fri, 3 May 2013 17:41:49 +0000 (10:41 -0700)]
am
b0a1e9fe: Don\'t show settings when popup is shown.
* commit '
b0a1e9fe925be1745bfb224867ee53562e027145':
Don't show settings when popup is shown.
Doris Liu [Fri, 3 May 2013 17:26:01 +0000 (10:26 -0700)]
Anchor camera controls when flipping device
Also adjusted margins for camera root view to avoid covering undo bar
Bug:
8758513
Bug:
8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
Angus Kong [Fri, 3 May 2013 00:45:01 +0000 (17:45 -0700)]
Don't show settings when popup is shown.
bug:
8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
George Mount [Thu, 2 May 2013 17:22:41 +0000 (10:22 -0700)]
am
49101abc: am
6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* commit '
49101abc1be1a5a19bc02e01683242230560e19c':
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Thu, 2 May 2013 17:20:56 +0000 (10:20 -0700)]
am
6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* commit '
6d7a2d3e32a27de28336176f856a7439b36252bd':
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Thu, 2 May 2013 17:19:24 +0000 (17:19 +0000)]
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* changes:
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Tue, 30 Apr 2013 18:53:46 +0000 (11:53 -0700)]
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
George Mount [Wed, 1 May 2013 23:56:32 +0000 (16:56 -0700)]
Allow prefetch for cache, reducing priority for prefetched images.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
nicolasroard [Thu, 2 May 2013 06:38:26 +0000 (23:38 -0700)]
am
6ef06ee3: am
f469a168: Fix flashing (remove clipping)
* commit '
6ef06ee314910347baed13fad487ad2a24f50c54':
Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 06:36:50 +0000 (23:36 -0700)]
am
f469a168: Fix flashing (remove clipping)
* commit '
f469a1689a9563f3c5bb68f46a5d9cd152d67053':
Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 03:48:56 +0000 (20:48 -0700)]
Fix flashing (remove clipping)
bug:
8747333
Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
nicolasroard [Thu, 2 May 2013 03:30:41 +0000 (20:30 -0700)]
nicolasroard [Thu, 2 May 2013 03:29:11 +0000 (20:29 -0700)]
nicolasroard [Wed, 1 May 2013 03:50:03 +0000 (20:50 -0700)]
Fix UI
bug:
8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
Bobby Georgescu [Thu, 2 May 2013 00:51:10 +0000 (17:51 -0700)]
am
9774a161: am
5a352be0: Increase selection limit
* commit '
9774a161aa1547ee92acff609189adca683cbce0':
Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:49:46 +0000 (17:49 -0700)]
am
5a352be0: Increase selection limit
* commit '
5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:27:19 +0000 (17:27 -0700)]
Increase selection limit
Bug:
8606565
Bug:
8721237
Bug:
8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
Michael Kolb [Wed, 1 May 2013 21:52:25 +0000 (14:52 -0700)]
am
ec7fc927: am
fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit '
ec7fc9277418d823c32c078c2c5589edbea3ad4b':
Fix layout and preview for tablets
Michael Kolb [Wed, 1 May 2013 21:50:04 +0000 (14:50 -0700)]
am
fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit '
fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
Fix layout and preview for tablets
Michael Kolb [Wed, 1 May 2013 21:48:29 +0000 (21:48 +0000)]
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:28:24 +0000 (13:28 -0700)]
Fix layout and preview for tablets
Bug:
8253060
Make controls full screen, and layout according to required size
Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
Baligh Uddin [Wed, 1 May 2013 20:55:37 +0000 (13:55 -0700)]
am
36648e50: am
32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
36648e508e8241757a1798e79d18d5a9abeccc45':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 20:52:07 +0000 (13:52 -0700)]
am
287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
287a40d1aba640d8bd6f82631d577524e544d071':
Import translations. DO NOT MERGE