git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

nicolasroard [Tue, 5 Mar 2013 15:56:32 +0000 (15:56 +0000)]

am 33aa75ea: am 00d7942c: am a28dcb04: am 6ee7feee: Visual History

* commit '33aa75eab7c74b69f18db0c38ca17f9bf58c1f0c':
Visual History

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 15:54:29 +0000 (15:54 +0000)]

am 00d7942c: am a28dcb04: am 6ee7feee: Visual History

* commit '00d7942c45618750c89eb1f246a78526b653b854':
Visual History

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 15:52:44 +0000 (15:52 +0000)]

am a28dcb04: am 6ee7feee: Visual History

* commit 'a28dcb04f4975fdc9e5ab8a5f212dd4de1b49904':
Visual History

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 15:50:28 +0000 (07:50 -0800)]

am 6ee7feee: Visual History

* commit '6ee7feeefec9e99ea6b98408323a416214d0e817':
Visual History

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 05:43:49 +0000 (21:43 -0800)]

Visual History

Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 03:10:28 +0000 (03:10 +0000)]

am 04498ea1: am 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

* commit '04498ea1c7950321e222f1603c413b8e1933df34':
Simplify and speed up thumbnail creation

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 03:09:07 +0000 (03:09 +0000)]

am 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

* commit '21b792016eafbe0e73d59308543821d1e02aa85e':
Simplify and speed up thumbnail creation

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 03:06:25 +0000 (03:06 +0000)]

am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

* commit '4446c6619033a62980e453ece3e72bb7bc105143':
Simplify and speed up thumbnail creation

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 03:04:43 +0000 (19:04 -0800)]

am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

* commit 'a0adf2113b8728d92f270953ca8cab50335fe68e':
Simplify and speed up thumbnail creation

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 03:03:04 +0000 (03:03 +0000)]

Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 02:44:14 +0000 (18:44 -0800)]

Simplify and speed up thumbnail creation

Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:47:39 +0000 (02:47 +0000)]

am 5873f637: am a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom

* commit '5873f6376a0134f41e375bbecb995ad3e6587cd9':
fixed vignetnette refresh during pan/zoom

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:45:53 +0000 (02:45 +0000)]

am a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom

* commit 'a2f1227a0442c037806260c832ded2a662df5900':
fixed vignetnette refresh during pan/zoom

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:43:21 +0000 (02:43 +0000)]

am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom

* commit 'b59417626daa9513246171b53f965a37f7273597':
fixed vignetnette refresh during pan/zoom

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:40:29 +0000 (18:40 -0800)]

am fc7d4651: fixed vignetnette refresh during pan/zoom

* commit 'fc7d46515db7a3a50f7416c2462030609391cf95':
fixed vignetnette refresh during pan/zoom

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:33:55 +0000 (18:33 -0800)]

fixed vignetnette refresh during pan/zoom

Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:17:36 +0000 (02:17 +0000)]

am fd8c3daa: am 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation

* commit 'fd8c3daa72959a6733cabaede149036a95d70987':
fix tiny planet shown after rotation

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:15:17 +0000 (02:15 +0000)]

am 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation

* commit '81e7e8858cc5417b36fe4db9e54418a3607fd05f':
fix tiny planet shown after rotation

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:13:35 +0000 (02:13 +0000)]

am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation

* commit '2a20a8a21f42649a50c60636605c7d57f87d49f4':
fix tiny planet shown after rotation

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 02:11:14 +0000 (18:11 -0800)]

am 5300e0c5: fix tiny planet shown after rotation

* commit '5300e0c54110d67f85fdb2ee9c90be58f50ca4ac':
fix tiny planet shown after rotation

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 01:56:54 +0000 (01:56 +0000)]

am 355ff89a: am 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel behaviour

* commit '355ff89a03bf762ca446ea6c83a10439ad2b489a':
Improves state/history panel behaviour

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 01:55:01 +0000 (01:55 +0000)]

am 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel behaviour

* commit '27b3dc499ba6491829ec80777130035cf596c2b0':
Improves state/history panel behaviour

commit | commitdiff | tree

John Hoford [Tue, 5 Mar 2013 01:50:58 +0000 (17:50 -0800)]

fix tiny planet shown after rotation

Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 01:53:03 +0000 (01:53 +0000)]

am a4a98183: am cdea1074: Improves state/history panel behaviour

* commit 'a4a98183d17fc4d9f130819698fd6988670982ea':
Improves state/history panel behaviour

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 01:51:03 +0000 (17:51 -0800)]

am cdea1074: Improves state/history panel behaviour

* commit 'cdea10749cbdb6bab8f49f1b5b562b6e89781981':
Improves state/history panel behaviour

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:42:53 +0000 (16:42 -0800)]

Improves state/history panel behaviour

Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:21:00 +0000 (00:21 +0000)]

am 2527ae33: am 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce

* commit '2527ae3380321b9fd1e66cd0a561e637d2a0660a':
Fix build break.

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:18:58 +0000 (00:18 +0000)]

am 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce

* commit '93f62367d7a8d8a82f95cc7beb0d2b9912626df6':
Fix build break.

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:17:38 +0000 (00:17 +0000)]

am 91ddd713: am ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce

* commit '91ddd713de94ffeaabe257fb33dcdaae3c2e2a79':
UI cleanup

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:17:23 +0000 (00:17 +0000)]

am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce

* commit 'e9af70567534c4c946347b3cfd9f005a363c5c0a':
Fix build break.

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:15:35 +0000 (00:15 +0000)]

am ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce

* commit 'ea67dbae8ddc6b8e1cf0e6e7ffd2cfc7b1973db0':
UI cleanup

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:14:35 +0000 (16:14 -0800)]

am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce

* commit '9c223cf1072172845c9118fac028371b5a57919a':
Fix build break.

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:14:02 +0000 (00:14 +0000)]

am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce

* commit 'c241545ab013a81f4d30528c52139a7b664edf2e':
UI cleanup

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:12:18 +0000 (00:12 +0000)]

am 17d3e33a: am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '17d3e33ac65d8ec16b1035afefd8f2a52276150e':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:11:24 +0000 (16:11 -0800)]

am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce

* commit 'c882c3fec7409a40d4b4ff401fcfa81be7684424':
UI cleanup

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)]

Merge "Fix build break." into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:09:29 +0000 (00:09 +0000)]

Merge "UI cleanup" into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Tue, 5 Mar 2013 00:08:30 +0000 (16:08 -0800)]

Fix build break.

Change-Id: If19356395fe005a98036888cd9a688c4d36720ea

commit | commitdiff | tree

nicolasroard [Tue, 5 Mar 2013 00:01:24 +0000 (16:01 -0800)]

UI cleanup

Change-Id: Iaf138455651511e610b640a716820bd846284948

commit | commitdiff | tree

George Mount [Mon, 4 Mar 2013 23:55:20 +0000 (23:55 +0000)]

am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '3bd9aa89c398e0a319647bc98b7bb5b60bdde847':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

commit | commitdiff | tree

George Mount [Mon, 4 Mar 2013 23:53:50 +0000 (23:53 +0000)]

am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '6f99159695f952b4e2d1d3a968354bdd3b9e4e64':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

commit | commitdiff | tree

George Mount [Mon, 4 Mar 2013 23:49:05 +0000 (15:49 -0800)]

am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '8438e10230fe1ce102e5c29f8eac6c96e4eec900':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

commit | commitdiff | tree

George Mount [Mon, 4 Mar 2013 23:47:29 +0000 (23:47 +0000)]

Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Thu, 28 Feb 2013 18:52:59 +0000 (10:52 -0800)]

Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:39:33 +0000 (20:39 +0000)]

am e8811895: am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit 'e8811895d188ff3067076657660784a5689065b5':
Clean up comments

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:37:44 +0000 (20:37 +0000)]

am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '14427b5e98bfbad82c263fe1a060a3040107fc8c':
Clean up comments

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:35:57 +0000 (20:35 +0000)]

am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '8dab2ccb07e41a5b5fa9b53cc3290cb42c508978':
Clean up comments

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:34:19 +0000 (12:34 -0800)]

am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085':
Clean up comments

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:32:43 +0000 (20:32 +0000)]

Merge "Clean up comments" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 20:29:42 +0000 (12:29 -0800)]

Clean up comments

Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c

commit | commitdiff | tree

The Android Open Source Project [Mon, 4 Mar 2013 19:12:39 +0000 (19:12 +0000)]

am 6e3b0275: (-s ours) am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '6e3b02758544d1f326c26d2c410dbd486266c274':
Fix for applied ratios
Fix crop ratio

commit | commitdiff | tree

The Android Open Source Project [Mon, 4 Mar 2013 19:10:06 +0000 (19:10 +0000)]

am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'dd3f00a05b018b94209a1f32f5d5d384c071285e':
Fix for applied ratios
Fix crop ratio

commit | commitdiff | tree

The Android Open Source Project [Mon, 4 Mar 2013 19:06:56 +0000 (11:06 -0800)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1

commit | commitdiff | tree

Doris Liu [Mon, 4 Mar 2013 18:43:26 +0000 (18:43 +0000)]

am 62963838: am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

* commit '62963838e6ed6a8f340b1a0f0c224d56347bc0ac':
Flatten view hierarchy and rotate views

commit | commitdiff | tree

Doris Liu [Mon, 4 Mar 2013 18:41:46 +0000 (18:41 +0000)]

am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

* commit 'cb0103e283880817a4f02a5381b04b68f89a4879':
Flatten view hierarchy and rotate views

commit | commitdiff | tree

Doris Liu [Mon, 4 Mar 2013 18:37:29 +0000 (10:37 -0800)]

am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

* commit 'fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71':
Flatten view hierarchy and rotate views

commit | commitdiff | tree

Doris Liu [Mon, 4 Mar 2013 18:36:36 +0000 (18:36 +0000)]

Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Tue, 26 Feb 2013 18:54:25 +0000 (10:54 -0800)]

Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf

commit | commitdiff | tree

The Android Automerger [Mon, 4 Mar 2013 13:56:10 +0000 (05:56 -0800)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Bobby Georgescu [Sun, 3 Mar 2013 00:30:31 +0000 (00:30 +0000)]

am 07826912: am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

* commit '07826912ad44e60549959c5f42dfe5b0cd3ff62f':
Refactor AutoThumbnailDrawable, fix race conditions

commit | commitdiff | tree

Bobby Georgescu [Sun, 3 Mar 2013 00:29:05 +0000 (00:29 +0000)]

am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

* commit 'f960b10f37a395216dcf173f861f38ba018bf494':
Refactor AutoThumbnailDrawable, fix race conditions

commit | commitdiff | tree

Bobby Georgescu [Sun, 3 Mar 2013 00:24:02 +0000 (16:24 -0800)]

am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

* commit 'e118ac5340f04b2cd8e421bee3f85db723a51d38':
Refactor AutoThumbnailDrawable, fix race conditions

commit | commitdiff | tree

Bobby Georgescu [Sat, 2 Mar 2013 18:10:37 +0000 (18:10 +0000)]

Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Fri, 1 Mar 2013 22:09:51 +0000 (14:09 -0800)]

Refactor AutoThumbnailDrawable, fix race conditions

Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530

commit | commitdiff | tree

Bart Sears [Sat, 2 Mar 2013 02:25:58 +0000 (02:25 +0000)]

am d9e7e348: am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003

* commit 'd9e7e3480af192df7f7ae1c48b93fc33d89ecea6':
Bump up the version number to 1.1.40003

commit | commitdiff | tree

Bart Sears [Sat, 2 Mar 2013 02:24:17 +0000 (02:24 +0000)]

am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003

* commit '9655fd0b137c254785da24d17aedecca7c25af80':
Bump up the version number to 1.1.40003

commit | commitdiff | tree

Bart Sears [Sat, 2 Mar 2013 02:21:46 +0000 (18:21 -0800)]

am d64f356d: Bump up the version number to 1.1.40003

* commit 'd64f356dfbd8d555a8a474bb61af3b2d2b40b208':
Bump up the version number to 1.1.40003

commit | commitdiff | tree

Bart Sears [Sat, 2 Mar 2013 02:11:07 +0000 (18:11 -0800)]

Bump up the version number to 1.1.40003

Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 23:06:26 +0000 (23:06 +0000)]

am eb7b7589: am fd2a70f1: am 276a04db: Fix preview rendering speed...

* commit 'eb7b7589caaf4803fae15da6a99c5d7227a12a05':
Fix preview rendering speed...

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 23:04:04 +0000 (23:04 +0000)]

am fd2a70f1: am 276a04db: Fix preview rendering speed...

* commit 'fd2a70f17e4e1e97f0d7921473fa07eb2e516b81':
Fix preview rendering speed...

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:59:38 +0000 (14:59 -0800)]

am 276a04db: Fix preview rendering speed...

* commit '276a04dbeb9202239a6a6fec4109ad3c38ba4d5d':
Fix preview rendering speed...

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:54:16 +0000 (14:54 -0800)]

Fix preview rendering speed...

Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:50:41 +0000 (22:50 +0000)]

am 777d8002: am accef0c1: am 36633e24: Fix disappearing border thumbnails

* commit '777d80020fd06abb2d0c96500d2d31ea17b6f928':
Fix disappearing border thumbnails

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:48:10 +0000 (22:48 +0000)]

am accef0c1: am 36633e24: Fix disappearing border thumbnails

* commit 'accef0c1368ef25027cbd7545279abfe6833cb60':
Fix disappearing border thumbnails

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:42:23 +0000 (14:42 -0800)]

am 36633e24: Fix disappearing border thumbnails

* commit '36633e241115ff047fff3da5450bbd75adb343f1':
Fix disappearing border thumbnails

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:39:25 +0000 (14:39 -0800)]

Fix disappearing border thumbnails

Change-Id: I9ed43646a353658a590354f13e51dc96fa760442

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:16:28 +0000 (22:16 +0000)]

am 5e220eac: am bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

* commit '5e220eac167d3319185a43e5fb1957f2d5ab6597':
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:15:14 +0000 (22:15 +0000)]

am bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

* commit 'bbc7c4aa6e1329e3ca844e02eed586ae589b5bdf':
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

commit | commitdiff | tree

nicolasroard [Fri, 1 Mar 2013 22:10:08 +0000 (14:10 -0800)]

am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

* commit '3a5556d3ce5dba33021867468ae0d5d222f256db':
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 22:02:49 +0000 (22:02 +0000)]

am c5cc3742: am 6bd8caa9: am 87835aa0: fix imports

* commit 'c5cc3742fbae9ad6a8f8d71fa8e58a6763f38ba5':
fix imports

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 22:00:25 +0000 (22:00 +0000)]

am 6bd8caa9: am 87835aa0: fix imports

* commit '6bd8caa97e53bb50cb48792262a42fbf516c04fc':
fix imports

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:56:59 +0000 (13:56 -0800)]

am 87835aa0: fix imports

* commit '87835aa01412f9ba20eb57ac0cbbad3a19b48623':
fix imports

commit | commitdiff | tree

nicolasroard [Thu, 28 Feb 2013 20:11:35 +0000 (12:11 -0800)]

Improves State panel and Refactor FilterShowActivity
- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)

Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 21:44:44 +0000 (21:44 +0000)]

am 650e5410: am 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

* commit '650e541008d758847f27428bfccf2ad0fdca6fe1':
Fix crash if a tile ends up with a width or height of 0

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:43:32 +0000 (13:43 -0800)]

fix imports

Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 21:43:10 +0000 (21:43 +0000)]

am 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

* commit '1c73be8d249a646f6e7cfe3aba62ad61bae0b90d':
Fix crash if a tile ends up with a width or height of 0

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:38:09 +0000 (21:38 +0000)]

am 6cb6e981: am bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

* commit '6cb6e981b6642835d72b067292fafa6f9530557f':
fixed hiding of tiny planet

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 21:36:48 +0000 (13:36 -0800)]

am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

* commit '3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58':
Fix crash if a tile ends up with a width or height of 0

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:36:36 +0000 (21:36 +0000)]

am bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

* commit 'bbec362ec2b624063e9abd5d63164aeda7c2239b':
fixed hiding of tiny planet

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 21:35:49 +0000 (21:35 +0000)]

Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:32:40 +0000 (13:32 -0800)]

am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

* commit '7b9a9475f04b7f6a547c66a5446f651f2b7c693e':
fixed hiding of tiny planet

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:31:50 +0000 (21:31 +0000)]

Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Fri, 1 Mar 2013 21:22:57 +0000 (13:22 -0800)]

fixed hiding of tiny planet

Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 21:27:28 +0000 (13:27 -0800)]

Fix crash if a tile ends up with a width or height of 0

Bug: 8242279

Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 19:38:17 +0000 (19:38 +0000)]

am 2df4e2fc: am a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce

* commit '2df4e2fc1e0bcb2f07670b364982751279555382':
Add full screen image view

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 19:36:32 +0000 (19:36 +0000)]

am a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce

* commit 'a96e88e16b28f4221dbae1ef92863bffcaadf1c1':
Add full screen image view

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 19:31:59 +0000 (11:31 -0800)]

am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce

* commit 'e2fd033b6d836365779f3db73d8f0f305e1d9a62':
Add full screen image view

commit | commitdiff | tree

John Reck [Fri, 1 Mar 2013 19:30:34 +0000 (19:30 +0000)]

Merge "Add full screen image view" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 28 Feb 2013 00:48:16 +0000 (16:48 -0800)]

Add full screen image view

Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4

commit | commitdiff | tree

Baligh Uddin [Fri, 1 Mar 2013 19:19:46 +0000 (19:19 +0000)]

am 33e4f0c4: (-s ours) am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '33e4f0c479cf8719d9dd477aa99ce210104e634a':
Import translations. DO NOT MERGE