OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam a6adeb67: (-s ours) am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours...
Baligh Uddin [Wed, 6 Mar 2013 16:58:06 +0000 (16:58 +0000)]
am a6adeb67: (-s ours) am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'a6adeb67c4efd7b927556060ac0b0f5ff8e076ee':
  Import translations. DO NOT MERGE

11 years agoam 88e4fa77: (-s ours) am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations...
Baligh Uddin [Wed, 6 Mar 2013 16:58:05 +0000 (16:58 +0000)]
am 88e4fa77: (-s ours) am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '88e4fa77a8acc61063adcff7deda4f049c1559ac':
  Import translations. DO NOT MERGE

11 years agoam 4e0971d5: am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric...
Doris Liu [Wed, 6 Mar 2013 16:58:04 +0000 (16:58 +0000)]
am 4e0971d5: am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '4e0971d53240836b20cb29ca8c8d7df2f1ac6211':
  Add a black bar symmetric to nav bar

11 years agoam 1fbeaeb7: am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on...
Doris Liu [Wed, 6 Mar 2013 16:58:04 +0000 (16:58 +0000)]
am 1fbeaeb7: am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '1fbeaeb7da57a674ff6ad6612e72800bffcdf0bc':
  Keep camera controls on the same physical side

11 years agoam 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations...
Baligh Uddin [Wed, 6 Mar 2013 16:53:31 +0000 (16:53 +0000)]
am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '6846c5d0b7373a2c515e0573041e57f0989171c7':
  Import translations. DO NOT MERGE

11 years agoam 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 6 Mar 2013 16:53:30 +0000 (16:53 +0000)]
am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3bc1bc3ca7aed8582e7990edce13b25239bd54ff':
  Import translations. DO NOT MERGE

11 years agoam 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar...
Doris Liu [Wed, 6 Mar 2013 16:53:30 +0000 (16:53 +0000)]
am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '0e53c3a74f4ab4a7aab04ff048a62ede0a737c08':
  Add a black bar symmetric to nav bar

11 years agoam 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physic...
Doris Liu [Wed, 6 Mar 2013 16:53:29 +0000 (16:53 +0000)]
am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '2e4f5399d2e3b79708d743672d30e480157a6b12':
  Keep camera controls on the same physical side

11 years agoam 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]
am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2962966e5f274b77380cf5716a61aff5c1b55355':
  Import translations. DO NOT MERGE

11 years agoam 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]
am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '670444be68f153511e05af6df89beeabe89313b2':
  Import translations. DO NOT MERGE

11 years agoam 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub...
Doris Liu [Wed, 6 Mar 2013 16:47:53 +0000 (16:47 +0000)]
am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '9a08794fcb62acde0cc1dcd09a739060d1a4ea0b':
  Add a black bar symmetric to nav bar

11 years agoam 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side"...
Doris Liu [Wed, 6 Mar 2013 16:47:52 +0000 (16:47 +0000)]
am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '62bacd5dfad22b619d2ded3b8a9680b2538869e5':
  Keep camera controls on the same physical side

11 years agoam 6f5ddafb: (-s ours) Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 6 Mar 2013 16:46:49 +0000 (16:46 +0000)]
am 6f5ddafb: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '6f5ddafb00db61c670ab239eb9a021785f75dcd9':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into master-security-dev
Baligh Uddin [Wed, 6 Mar 2013 06:04:11 +0000 (06:04 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 6 Mar 2013 06:03:31 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 6 Mar 2013 06:03:31 +0000 (22:03 -0800)]
am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'f831c736a3c0c20b59873d98f8abe5b2a234f402':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 6 Mar 2013 06:02:43 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 6 Mar 2013 06:02:21 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:48:28 +0000 (19:48 -0800)]
am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '7f51a8455b34d794797388d31c1b42b0de9844d5':
  Add a black bar symmetric to nav bar

11 years agoam 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos...
Doris Liu [Wed, 6 Mar 2013 03:48:27 +0000 (19:48 -0800)]
am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '457bab952ea6b8babf2d37c817f06aed3829ba61':
  Keep camera controls on the same physical side

11 years agoMerge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:47:13 +0000 (03:47 +0000)]
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

11 years agoMerge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:46:52 +0000 (03:46 +0000)]
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

11 years agoAdd a black bar symmetric to nav bar
Doris Liu [Tue, 5 Mar 2013 17:54:25 +0000 (09:54 -0800)]
Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4

11 years agoam b0d54928: am e0525c05: am 72693710: am 63b33e8c: Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:44:38 +0000 (22:44 +0000)]
am b0d54928: am e0525c05: am 72693710: am 63b33e8c: Improves visual history

* commit 'b0d54928b9e386e686073ae9491a27b51127dfb5':
  Improves visual history

11 years agoam e0525c05: am 72693710: am 63b33e8c: Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:39:57 +0000 (22:39 +0000)]
am e0525c05: am 72693710: am 63b33e8c: Improves visual history

* commit 'e0525c05191a56624a27fcaccf0a21a74fd6abd0':
  Improves visual history

11 years agoam 72693710: am 63b33e8c: Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:37:58 +0000 (22:37 +0000)]
am 72693710: am 63b33e8c: Improves visual history

* commit '726937108a1d39b3c8ecdd7e2088ffccc7d1dd1d':
  Improves visual history

11 years agoam 63b33e8c: Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:33:34 +0000 (14:33 -0800)]
am 63b33e8c: Improves visual history

* commit '63b33e8c7ebeeec2b520fb419d89ada712ad6604':
  Improves visual history

11 years agoImproves visual history
nicolasroard [Tue, 5 Mar 2013 22:27:54 +0000 (14:27 -0800)]
Improves visual history

Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9

11 years agoKeep camera controls on the same physical side
Doris Liu [Tue, 5 Mar 2013 06:19:10 +0000 (22:19 -0800)]
Keep camera controls on the same physical side

Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a

11 years agoam 33aa75ea: am 00d7942c: am a28dcb04: am 6ee7feee: Visual History
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

11 years agoam 00d7942c: am a28dcb04: am 6ee7feee: Visual History
nicolasroard [Tue, 5 Mar 2013 15:54:29 +0000 (15:54 +0000)]
am 00d7942c: am a28dcb04: am 6ee7feee: Visual History

* commit '00d7942c45618750c89eb1f246a78526b653b854':
  Visual History

11 years agoam a28dcb04: am 6ee7feee: Visual History
nicolasroard [Tue, 5 Mar 2013 15:52:44 +0000 (15:52 +0000)]
am a28dcb04: am 6ee7feee: Visual History

* commit 'a28dcb04f4975fdc9e5ab8a5f212dd4de1b49904':
  Visual History

11 years agoam 6ee7feee: Visual History
nicolasroard [Tue, 5 Mar 2013 15:50:28 +0000 (07:50 -0800)]
am 6ee7feee: Visual History

* commit '6ee7feeefec9e99ea6b98408323a416214d0e817':
  Visual History

11 years agoVisual History
nicolasroard [Tue, 5 Mar 2013 05:43:49 +0000 (21:43 -0800)]
Visual History

Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db

11 years agoam 04498ea1: am 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up...
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

11 years agoam 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creatio...
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

11 years agoam 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb...
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

11 years agoam a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
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

11 years agoMerge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 03:03:04 +0000 (03:03 +0000)]
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

11 years agoSimplify and speed up thumbnail creation
nicolasroard [Tue, 5 Mar 2013 02:44:14 +0000 (18:44 -0800)]
Simplify and speed up thumbnail creation

Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e

11 years agoam 5873f637: am a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during...
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

11 years agoam a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom
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

11 years agoam b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom
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

11 years agoam fc7d4651: fixed vignetnette refresh during pan/zoom
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

11 years agofixed vignetnette refresh during pan/zoom
John Hoford [Tue, 5 Mar 2013 02:33:55 +0000 (18:33 -0800)]
fixed vignetnette refresh during pan/zoom

Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf

11 years agoam fd8c3daa: am 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation
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

11 years agoam 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation
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

11 years agoam 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation
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

11 years agoam 5300e0c5: fix tiny planet shown after rotation
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

11 years agoam 355ff89a: am 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel...
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

11 years agoam 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel behaviour
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

11 years agofix tiny planet shown after rotation
John Hoford [Tue, 5 Mar 2013 01:50:58 +0000 (17:50 -0800)]
fix tiny planet shown after rotation

Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116

11 years agoam a4a98183: am cdea1074: Improves state/history panel behaviour
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

11 years agoam cdea1074: Improves state/history panel behaviour
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

11 years agoImproves state/history panel behaviour
nicolasroard [Tue, 5 Mar 2013 00:42:53 +0000 (16:42 -0800)]
Improves state/history panel behaviour

Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68

11 years agoam 2527ae33: am 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into...
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.

11 years agoam 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos...
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.

11 years agoam 91ddd713: am ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub...
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

11 years agoam e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce
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.

11 years agoam ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
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

11 years agoam 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce
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.

11 years agoam c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
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

11 years agoam 17d3e33a: am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and...
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

11 years agoam c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
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

11 years agoMerge "Fix build break." into gb-ub-photos-bryce
George Mount [Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)]
Merge "Fix build break." into gb-ub-photos-bryce

11 years agoMerge "UI cleanup" into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 00:09:29 +0000 (00:09 +0000)]
Merge "UI cleanup" into gb-ub-photos-bryce

11 years agoFix build break.
George Mount [Tue, 5 Mar 2013 00:08:30 +0000 (16:08 -0800)]
Fix build break.

Change-Id: If19356395fe005a98036888cd9a688c4d36720ea

11 years agoUI cleanup
nicolasroard [Tue, 5 Mar 2013 00:01:24 +0000 (16:01 -0800)]
UI cleanup

Change-Id: Iaf138455651511e610b640a716820bd846284948

11 years agoam 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow...
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

11 years agoam 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to...
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

11 years agoam 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against...
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

11 years agoMerge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle...
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

11 years agoUpdate PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
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

11 years agoam e8811895: am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into...
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

11 years agoam 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos...
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

11 years agoam 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
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

11 years agoam 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
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

11 years agoMerge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:32:43 +0000 (20:32 +0000)]
Merge "Clean up comments" into gb-ub-photos-bryce

11 years agoClean up comments
Bobby Georgescu [Mon, 4 Mar 2013 20:29:42 +0000 (12:29 -0800)]
Clean up comments

Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Mar 2013 20:27:55 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: I230e568e9da104f2bdb039c0fd2fd560e38cfa4d
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Mar 2013 20:27:28 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: I9fbf1ac0828d33d7c048d49210cd24bc6d6aad63
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Mar 2013 20:27:03 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic524e207ef265824359c697e352dd4007af74f31
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Mar 2013 20:26:38 +0000 (12:26 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13
Auto-generated-cl: translation import

11 years agoam 6e3b0275: (-s ours) am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do...
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

11 years agoam dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge
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

11 years agoReconcile with jb-mr2-release - do not merge
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

11 years agoam 62963838: am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views...
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

11 years agoam cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb...
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

11 years agoam fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
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

11 years agoMerge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
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

11 years agoFlatten view hierarchy and rotate views
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

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
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

11 years agoam 07826912: am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix...
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

11 years agoam f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions...
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

11 years agoam e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb...
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

11 years agoMerge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
Bobby Georgescu [Sat, 2 Mar 2013 18:10:37 +0000 (18:10 +0000)]
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

11 years agoRefactor AutoThumbnailDrawable, fix race conditions
Bobby Georgescu [Fri, 1 Mar 2013 22:09:51 +0000 (14:09 -0800)]
Refactor AutoThumbnailDrawable, fix race conditions

Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530

11 years agoam d9e7e348: am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003
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

11 years agoam 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003
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

11 years agoam d64f356d: Bump up the version number to 1.1.40003
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