OSDN Git Service
George Mount [Mon, 5 Nov 2012 23:40:13 +0000 (15:40 -0800)]
am
1b5a21d2: am
6e806709: am
4dd4d80a: Remove progress bar when switching to grid mode.
* commit '
1b5a21d2286d50f1da3a3df0f40c1144c5778882':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:11 +0000 (15:40 -0800)]
am
23d7dd46: am
ddb30c54: am
4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
* commit '
23d7dd46aff419f0994840c6a085cc089969b5d7':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:10 +0000 (15:40 -0800)]
Ruben Brunk [Mon, 5 Nov 2012 23:40:08 +0000 (15:40 -0800)]
am
c6381a2a: am
91491889: am
b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:07 +0000 (15:40 -0800)]
am
239bc478: am
5ae82e1e: am
08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
* commit '
239bc478a7dfa9343eb8b2547fb54172f50e72aa':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:05 +0000 (15:40 -0800)]
am
5e1709a2: am
f795b403: am
b037754e: Fix sharing state in Gallery ActionBar
* commit '
5e1709a237e08cf12e0335796ed17ecb24d5a632':
nicolasroard [Mon, 5 Nov 2012 23:40:04 +0000 (15:40 -0800)]
Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]
am
a175392c: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
a175392c7073819ee6711099d6ce6aa40167b8dd':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]
am
52e44d24: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
52e44d249893969910b241aded0f9796d5dfa03d':
Scott Main [Mon, 5 Nov 2012 23:39:59 +0000 (15:39 -0800)]
am
b07da381: am
44adb1ee: (-s ours) am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
b07da3812737997ecec4c4a980411b6a8d88caff':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:58 +0000 (15:39 -0800)]
am
5fd5a8be: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
5fd5a8be5f387466f2ffc1b89b2356ea2a9bdff1':
John Reck [Mon, 5 Nov 2012 23:39:56 +0000 (15:39 -0800)]
am
d2f8bc06: am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
d2f8bc069269542936f0e21595081093b86fa474':
nicolasroard [Mon, 5 Nov 2012 23:39:54 +0000 (15:39 -0800)]
am
1bde451f: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
1bde451f817f716c7091b36dc92f714b69c5b363':
George Mount [Mon, 5 Nov 2012 23:39:53 +0000 (15:39 -0800)]
am
39f548a5: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
39f548a5e9764afa105af687e4db15ed8b7c47cd':
nicolasroard [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)]
am
a15b5195: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
a15b51954535b1f2320a577c0a72c676775f4208':
nicolasroard [Mon, 5 Nov 2012 23:39:48 +0000 (15:39 -0800)]
am
5206cc56: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
5206cc568e7b7122a7b7c18ba117d19427ba0671':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:47 +0000 (15:39 -0800)]
am
3234d83c: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
3234d83c379cd65e626adb84a917bb73cb37c6a1':
Sascha Haeberling [Mon, 5 Nov 2012 23:39:45 +0000 (15:39 -0800)]
am
8bbc73f4: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
8bbc73f4cf2d29e101e9570a11cd1604460f31ac':
Scott Main [Mon, 5 Nov 2012 23:39:43 +0000 (15:39 -0800)]
am
28c4d6bb: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
28c4d6bbded4b2702368cc78340e4136d0878525':
Doris Liu [Mon, 5 Nov 2012 23:39:41 +0000 (15:39 -0800)]
am
d69d5b63: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
d69d5b639570688122c847898943b1a1bbfa43f0':
Ruben Brunk [Mon, 5 Nov 2012 23:39:39 +0000 (15:39 -0800)]
Jason Noguchi [Mon, 5 Nov 2012 23:39:37 +0000 (15:39 -0800)]
am
7218147e: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
7218147e6d81315245e3a485fb954761af687b2f':
Baligh Uddin [Mon, 5 Nov 2012 23:39:35 +0000 (15:39 -0800)]
am
2709de53: am
ab81203d: (-s ours) am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2709de537dd57a1ac329b35fc29a165aa1e2ae16':
Baligh Uddin [Mon, 5 Nov 2012 23:39:34 +0000 (15:39 -0800)]
am
19460c5e: (-s ours) am
6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
19460c5e8d1bfbdb43c0ec32e05a57458e5561ab':
Bobby Georgescu [Mon, 5 Nov 2012 23:38:02 +0000 (15:38 -0800)]
am
8cd8a93e: am
cc70347d: am
737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
* commit '
8cd8a93eae3158f8469026f65e7d31819ae38fab':
Doris Liu [Mon, 5 Nov 2012 23:38:01 +0000 (15:38 -0800)]
am
1febb98e: am
637a7f1b: am
0addfc7f: Save edited picasa to "Edited Online Photos" album
* commit '
1febb98e498f425935cfafdb492283b42ef61c87':
Ruben Brunk [Mon, 5 Nov 2012 23:37:59 +0000 (15:37 -0800)]
am
be7c16de: am
5d596558: am
ef8597fe: Fixed disappearing aspect ratio button.
* commit '
be7c16de9647b449ed417ae16315b47aaa143a83':
Doris Liu [Mon, 5 Nov 2012 23:37:58 +0000 (15:37 -0800)]
am
1fd563a6: am
04114762: am
6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
* commit '
1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7':
Ruben Brunk [Mon, 5 Nov 2012 23:37:56 +0000 (15:37 -0800)]
am
80e62189: am
193c3f0c: am
3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
* commit '
80e6218918b508f6147c8cc9699df8d338e50a95':
John Hoford [Mon, 5 Nov 2012 23:37:54 +0000 (15:37 -0800)]
am
5acccefe: am
e12e6962: am
da974d84: fix crash from configurable slider ranges
* commit '
5acccefeadeff7ff09683b165ac1516d733bf75b':
Ruben Brunk [Mon, 5 Nov 2012 23:37:53 +0000 (15:37 -0800)]
am
d0b53c08: am
1056ce1a: am
43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
* commit '
d0b53c08d88a696170989d6c0c72f8cbb26ac654':
John Hoford [Mon, 5 Nov 2012 23:37:51 +0000 (15:37 -0800)]
am
272546bb: am
abe96287: am
de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
* commit '
272546bbbfa29cc0fd273003a071e735631a4766':
nicolasroard [Mon, 5 Nov 2012 23:37:50 +0000 (15:37 -0800)]
am
8e71835d: am
21c91bfb: am
ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
* commit '
8e71835d2d34e33a1622fbf66308fc0ccfc6f876':
John Reck [Mon, 5 Nov 2012 23:37:48 +0000 (15:37 -0800)]
am
d6d9db90: am
d07026bf: am
57731ee2: Only fade out if texture creation succeeded
* commit '
d6d9db90be8b088f80c2023c69fbdc0f9e75b816':
Mangesh Ghiware [Mon, 5 Nov 2012 23:37:46 +0000 (15:37 -0800)]
am
c2c0b1b6: am
07c2c448: am
4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
* commit '
c2c0b1b623a2091d052362e213d7e8e81a772463':
Baligh Uddin [Mon, 5 Nov 2012 23:37:45 +0000 (15:37 -0800)]
am
d0ff9e6b: am
72b0fbef: (-s ours) am
77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d0ff9e6b30fb44a0a9c1984a611703751d682a31':
Baligh Uddin [Mon, 5 Nov 2012 23:37:43 +0000 (15:37 -0800)]
am
f71589e4: (-s ours) am
55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f71589e474392a62a41ab22da3bdd14d078611b8':
Baligh Uddin [Mon, 5 Nov 2012 22:11:50 +0000 (14:11 -0800)]
am
954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
954afb2e42b9894676f0e7f9fb9b22d5bcf8825c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 00:50:29 +0000 (16:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Bart Sears [Fri, 2 Nov 2012 22:38:09 +0000 (15:38 -0700)]
am
70fb3773: am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
70fb3773116bacdce3807a6ddfe386b43f4bbe80':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:36:33 +0000 (15:36 -0700)]
am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
b41864f13b83a4f2d92f601b2e4381762ad1effa':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
Baligh Uddin [Fri, 2 Nov 2012 14:24:09 +0000 (07:24 -0700)]
am
f350beb8: am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
f350beb8c64c38b959f27b9b917cdc58fe72868a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:21:55 +0000 (07:21 -0700)]
am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
3252800c7fe6bdb69b066eae0db739d06cfec64d':
Import translations. DO NOT MERGE
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:
7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
Baligh Uddin [Fri, 2 Nov 2012 05:07:22 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:07:02 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I981bbec359bbbf1414a78726bc55c20281ebda0f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe
Auto-generated-cl: translation import
George Mount [Thu, 1 Nov 2012 20:42:08 +0000 (13:42 -0700)]
am
bd52f5e7: am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:39:45 +0000 (13:39 -0700)]
am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
Bart Sears [Thu, 1 Nov 2012 20:02:01 +0000 (13:02 -0700)]
am
77262bd5: am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
77262bd58f4aba9bdb961c7a9be856502e120fb8':
Jump to lockscreen in secure album if tap on video
Bart Sears [Thu, 1 Nov 2012 20:00:18 +0000 (13:00 -0700)]
am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
Bart Sears [Thu, 1 Nov 2012 19:59:00 +0000 (12:59 -0700)]
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Sascha Haeberling [Thu, 1 Nov 2012 19:57:26 +0000 (12:57 -0700)]
am
452ce867: am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
452ce867e9d5837ede2e67d75fdaf07fb8ffcd57':
Fix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 19:54:07 +0000 (12:54 -0700)]
am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
George Mount [Thu, 1 Nov 2012 17:40:22 +0000 (10:40 -0700)]
Fix extra gray item in secure album.
Bug
7454444
Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
Angus Kong [Thu, 1 Nov 2012 07:08:44 +0000 (15:08 +0800)]
Jump to lockscreen in secure album if tap on video
bug:
7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
Sascha Haeberling [Thu, 1 Nov 2012 00:21:02 +0000 (17:21 -0700)]
Fix tiny planet not using XMP metadata anymore
Bug:
7452777
Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.
Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
Baligh Uddin [Wed, 31 Oct 2012 22:01:43 +0000 (15:01 -0700)]
am
8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8405f65e8b3a671562ea215b06ae91512a4734d7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:01:41 +0000 (15:01 -0700)]
am
f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f09fa2bf45d92e0284212960d73080d825e39351':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:00:49 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 21:59:28 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 16:43:39 +0000 (09:43 -0700)]
am
692a8536: am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
692a8536b790d50c506a7fb9588301eaff5e02c6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:41:08 +0000 (09:41 -0700)]
am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
262c7bd76f21d440f2da3a4118c432987fcb8cdd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:39:55 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 16:39:23 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:19:47 +0000 (09:19 -0700)]
am
a65e41a8: am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a65e41a88601586f5bcdc31933bb677af4fab243':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:17:52 +0000 (09:17 -0700)]
am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8d0392d623a88ace36fc4358c0d78e00377ca97f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:16:54 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 16:16:19 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Wu-cheng Li [Wed, 31 Oct 2012 06:50:02 +0000 (23:50 -0700)]
am
88cef187: am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
88cef187405439c515fc7c41a0fefe697736521f':
Add keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 06:47:17 +0000 (23:47 -0700)]
am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
471d898606bc15878b4d1708236f60157bab08df':
Add keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 03:12:05 +0000 (11:12 +0800)]
Add keyguard camera widget meta-data to gallery manifest.
bug:
7445471
Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264
Mangesh Ghiware [Wed, 31 Oct 2012 00:40:45 +0000 (17:40 -0700)]
am
0514c285: am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
0514c285cca2116bb8d07f657cf9c167f87e8bad':
Change protection level for GALLERY_PROVIDER to signatureOrSystem
Mangesh Ghiware [Wed, 31 Oct 2012 00:38:05 +0000 (17:38 -0700)]
am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
589381bffb30f4f4a84ebe59b9bc3a140153831c':
Change protection level for GALLERY_PROVIDER to signatureOrSystem
Baligh Uddin [Wed, 31 Oct 2012 00:22:09 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94a382290cc60de9ed982b1c8420cee050a4fabf
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:21:30 +0000 (17:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c49a77ba773ca74d6a2a481d811ff9083279fff
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:20:20 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:17:15 +0000 (17:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a260559e229c2b2464e07f0194eb2a60f30b4c1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:15:58 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I35fdf78b795b6316a70ef988f3488ddd64b1a1e7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:14:41 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e
Auto-generated-cl: translation import
Mangesh Ghiware [Tue, 30 Oct 2012 22:41:00 +0000 (15:41 -0700)]
Change protection level for GALLERY_PROVIDER to signatureOrSystem
Bug:
7433498
Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5
Tenghui Zhu [Tue, 30 Oct 2012 22:21:06 +0000 (15:21 -0700)]
am
3245b90f: am
310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
* commit '
3245b90f56edac635a3bcf7963d71a125d3b4312':
DO NOT MERGE: Do not set the background to null for video.
Tenghui Zhu [Tue, 30 Oct 2012 22:19:12 +0000 (15:19 -0700)]
am
310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
* commit '
310db394adcdb8677b9a3d0f37a4abee63bdbb50':
DO NOT MERGE: Do not set the background to null for video.
Tenghui Zhu [Tue, 30 Oct 2012 22:16:33 +0000 (15:16 -0700)]
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
Romain Guy [Thu, 4 Oct 2012 01:47:21 +0000 (18:47 -0700)]
DO NOT MERGE: Do not set the background to null for video.
Bug #
7275145
Bug
7405595
Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.
Cherry pick the Romain's change from jb-mr1-dev:
https://googleplex-android-review.googlesource.com/#/c/234571/
Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
Bart Sears [Tue, 30 Oct 2012 19:42:44 +0000 (12:42 -0700)]
am
3ac3cdd6: am
c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
* commit '
3ac3cdd66f291e0e7400204f7410c02cffd24183':
Show sync error toast only when both loading and syncing are done.
Bart Sears [Tue, 30 Oct 2012 19:40:36 +0000 (12:40 -0700)]
am
c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
* commit '
c7536cfa819d10e0c556ecb30c53a58c048fa327':
Show sync error toast only when both loading and syncing are done.
Bart Sears [Tue, 30 Oct 2012 19:39:23 +0000 (12:39 -0700)]
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
George Mount [Tue, 30 Oct 2012 18:37:28 +0000 (11:37 -0700)]
am
14a53420: am
aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit '
14a53420ee67fe971455d715af324266643ba0de':
Don't use an album for UriImages.
George Mount [Tue, 30 Oct 2012 18:35:11 +0000 (11:35 -0700)]
am
aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit '
aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
George Mount [Tue, 30 Oct 2012 18:33:21 +0000 (11:33 -0700)]
Merge "Don't use an album for UriImages." into gb-ub-photos-arches
Hung-ying Tyan [Tue, 30 Oct 2012 09:47:35 +0000 (17:47 +0800)]
Show sync error toast only when both loading and syncing are done.
Bug:
7427597
Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
George Mount [Mon, 29 Oct 2012 21:54:17 +0000 (14:54 -0700)]
Don't use an album for UriImages.
Bug
7422455
Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
Baligh Uddin [Mon, 29 Oct 2012 21:44:15 +0000 (14:44 -0700)]
am
1a2512cf: am
38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
1a2512cf1adf71c8a89e18eca40bef5bcc9fc451':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:44:14 +0000 (14:44 -0700)]
am
115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
115299f04552f97b019c45f1625a24b2c49b7a17':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:43:00 +0000 (14:43 -0700)]
am
38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:41:26 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
OSDN Git Service
