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

(root) / android-x86 / packages-apps-Camera2.git / log

Sascha Haeberling [Wed, 30 Jul 2014 18:16:08 +0000 (18:16 +0000)]

am 5d6232a0: am 77d49f93: am 3c52c014: am ef66e813: Cleaning up unused strings.

* commit '5d6232a03de4f799e3728d18ea5f0dee24a5063e':
Cleaning up unused strings.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 18:08:13 +0000 (18:08 +0000)]

am 77d49f93: am 3c52c014: am ef66e813: Cleaning up unused strings.

* commit '77d49f93848e02e6d9387c8c0e1af2be45252a85':
Cleaning up unused strings.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 18:03:41 +0000 (18:03 +0000)]

am 3c52c014: am ef66e813: Cleaning up unused strings.

* commit '3c52c0143597633f4224d49f9e129f6ba82d7f49':
Cleaning up unused strings.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:56:36 +0000 (17:56 +0000)]

am ef66e813: Cleaning up unused strings.

* commit 'ef66e81388982b89c710e75a9d9ae314b1de97f9':
Cleaning up unused strings.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:20 +0000 (17:01 +0000)]

am 7a154374: am c584cd65: am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation.

* commit '7a154374e255792978bed230c4fe1f5c3ba50526':
[OC] Camera2-based OneCamera implementation.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:12 +0000 (17:01 +0000)]

am 3f04b7e8: am 79f4bfea: am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

* commit '3f04b7e861af155e21584fd6f37c79a6f61077c0':
Put conversion from string to size into SettingsManager.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:11 +0000 (17:01 +0000)]

am 13fec59c: am c0fe8ca4: am 26529cab: am d674447d: Add empty version of SystemProperties interface.

* commit '13fec59ca243fb56771be5a4b48eeae464fb08c2':
Add empty version of SystemProperties interface.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:11 +0000 (17:01 +0000)]

am 141e4390: am a0ee9a9f: am 94a31ced: am ee36c5f5: Minor clean-up around the code base.

* commit '141e4390b06f8b9eb15b482dc52bc939333d968c':
Minor clean-up around the code base.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:10 +0000 (17:01 +0000)]

am 9b0ad18d: am a53b2b49: am facae275: am b0d171e8: [OC] Adding the OneCamera manager API.

* commit '9b0ad18d29454247d65c4a473ff9d8a41d30be33':
[OC] Adding the OneCamera manager API.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 17:01:10 +0000 (17:01 +0000)]

am eabf56fe: am 9af7311a: am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class.

* commit 'eabf56fe46cc942a5fc34c7984f305940192fb8b':
[OC] Add common abstract OneCamera class.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:42:16 +0000 (16:42 +0000)]

am c584cd65: am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation.

* commit 'c584cd65472d393fb1e48de3acdd12cd22da416c':
[OC] Camera2-based OneCamera implementation.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:42:10 +0000 (16:42 +0000)]

am 79f4bfea: am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

* commit '79f4bfeae5269d12faa08856d02c7181ae700557':
Put conversion from string to size into SettingsManager.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:42:09 +0000 (16:42 +0000)]

am c0fe8ca4: am 26529cab: am d674447d: Add empty version of SystemProperties interface.

* commit 'c0fe8ca434223e9c0d34113e848cb2a1fe671ffc':
Add empty version of SystemProperties interface.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:42:01 +0000 (16:42 +0000)]

am a0ee9a9f: am 94a31ced: am ee36c5f5: Minor clean-up around the code base.

* commit 'a0ee9a9f7a8ab06fc4f827f54a2d3941547518d0':
Minor clean-up around the code base.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:42:00 +0000 (16:42 +0000)]

am a53b2b49: am facae275: am b0d171e8: [OC] Adding the OneCamera manager API.

* commit 'a53b2b49836e40cd29491157d82feddbf6bd7b14':
[OC] Adding the OneCamera manager API.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 16:39:18 +0000 (16:39 +0000)]

am 9af7311a: am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class.

* commit '9af7311a2124de2a2b3eff989fc73a4c2ba9d3d5':
[OC] Add common abstract OneCamera class.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 14:28:43 +0000 (14:28 +0000)]

am 579bc2e8: am 4900ca46: am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera.

* commit '579bc2e8aa3898b6dfe71af7e96bb0c09fd6da1d':
[OC] Version 1 of the nterface for OneCamera.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 14:28:42 +0000 (14:28 +0000)]

am 8087a0ba: am 8ef539bf: am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

* commit '8087a0ba94a17555827f6453b37deccf2461f25b':
[OC] Adds a class with common utility functions for capture modules.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 14:16:03 +0000 (14:16 +0000)]

am 4900ca46: am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera.

* commit '4900ca464fd8656f34d1119605464c003126c751':
[OC] Version 1 of the nterface for OneCamera.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 14:15:59 +0000 (14:15 +0000)]

am 8ef539bf: am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

* commit '8ef539bf95ecda8f1b3d272fc2b413dcc316a6c6':
[OC] Adds a class with common utility functions for capture modules.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 02:43:42 +0000 (19:43 -0700)]

Cleaning up unused strings.

'et' and 'ms' are deprecated and have already been removed from master:
http://ag/506364

Change-Id: I0acb1a5225f0b7c9c3dcf449b0a16bb7f77118ed

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:37:56 +0000 (01:37 +0000)]

am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation.

* commit '8a25239af8cb5c874a888d22fba5b15bf6fa82ba':
[OC] Camera2-based OneCamera implementation.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:31:23 +0000 (01:31 +0000)]

am f5e51ec4: [OC] Camera2-based OneCamera implementation.

* commit 'f5e51ec44934d6d687267d2aff6386f5b728dd9f':
[OC] Camera2-based OneCamera implementation.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 00:28:46 +0000 (17:28 -0700)]

[OC] Camera2-based OneCamera implementation.

Bug: 16654225

Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:26:22 +0000 (01:26 +0000)]

am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

* commit '91469c4add9ed9b71172787208c96d3ddeedd857':
Put conversion from string to size into SettingsManager.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:26:21 +0000 (01:26 +0000)]

am 26529cab: am d674447d: Add empty version of SystemProperties interface.

* commit '26529cab53f4c71a02b07e704f122c3e42038efe':
Add empty version of SystemProperties interface.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:20:14 +0000 (01:20 +0000)]

am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

* commit '2f0010669ea789c1767527e960468b157796dfd4':
Put conversion from string to size into SettingsManager.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:20:14 +0000 (01:20 +0000)]

am d674447d: Add empty version of SystemProperties interface.

* commit 'd674447d33e21fcaca64ee916953d8b3c0288390':
Add empty version of SystemProperties interface.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:17:27 +0000 (01:17 +0000)]

am 94a31ced: am ee36c5f5: Minor clean-up around the code base.

* commit '94a31cedabac92345d6f2c019e8b58aef61a9a96':
Minor clean-up around the code base.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:17:26 +0000 (01:17 +0000)]

am facae275: am b0d171e8: [OC] Adding the OneCamera manager API.

* commit 'facae2755eff8b8ecf3b19edd3250ff924c13c06':
[OC] Adding the OneCamera manager API.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:05:59 +0000 (01:05 +0000)]

am ee36c5f5: Minor clean-up around the code base.

* commit 'ee36c5f591ac181a10692b2ec2b96de5251c4abb':
Minor clean-up around the code base.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:05:58 +0000 (01:05 +0000)]

am b0d171e8: [OC] Adding the OneCamera manager API.

* commit 'b0d171e892dffbc7ce0caf7415f96fa513c6f3fc':
[OC] Adding the OneCamera manager API.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 00:32:17 +0000 (17:32 -0700)]

Add empty version of SystemProperties interface.

This is so that we can use it in Camera2 code.

Change-Id: I764adb7377b91b5b54a33535188eb6d0d5159253

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 00:05:43 +0000 (17:05 -0700)]

Minor clean-up around the code base.

Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 23:29:02 +0000 (16:29 -0700)]

[OC] Adding the OneCamera manager API.

Bug: 16654225

Change-Id: I070f36a6e6c1e756223ff69b74c3171547090f97

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 23:40:29 +0000 (23:40 +0000)]

am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class.

* commit '242f3445b06887c0e1617026891878a30d01fcdd':
[OC] Add common abstract OneCamera class.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 23:34:15 +0000 (23:34 +0000)]

am 8c34b30b: [OC] Add common abstract OneCamera class.

* commit '8c34b30b2ae23ceb13f2912fe8b6f83c27940306':
[OC] Add common abstract OneCamera class.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 23:02:52 +0000 (16:02 -0700)]

[OC] Add common abstract OneCamera class.

Bug: 16654225

Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 23:03:05 +0000 (23:03 +0000)]

am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera.

* commit 'e3ee6745eeb2c37176a836caf3bf4497b50e95e8':
[OC] Version 1 of the nterface for OneCamera.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 22:59:28 +0000 (22:59 +0000)]

am 00c122a5: [OC] Version 1 of the nterface for OneCamera.

* commit '00c122a56f76d8ba523c324638e5083f721da01a':
[OC] Version 1 of the nterface for OneCamera.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 22:49:40 +0000 (22:49 +0000)]

am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

* commit '2513da81d582aee92d26340ba2432026e4bcb8c4':
[OC] Adds a class with common utility functions for capture modules.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 22:46:39 +0000 (15:46 -0700)]

[OC] Version 1 of the nterface for OneCamera.

Bug: 16654225

Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 22:45:15 +0000 (22:45 +0000)]

am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

* commit 'c7223fa97a33c3e8e51d26566a32558d6257e9b9':
[OC] Adds a class with common utility functions for capture modules.

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 22:41:54 +0000 (22:41 +0000)]

Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

commit | commitdiff | tree

Spike Sprague [Tue, 29 Jul 2014 19:17:06 +0000 (19:17 +0000)]

am 8f8ce3d6: am c00359da: am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup

* commit '8f8ce3d6205f72844c7c42579a68585c81c01ad9':
AndroidManifest formatting cleanup

commit | commitdiff | tree

Spike Sprague [Tue, 29 Jul 2014 19:13:26 +0000 (19:13 +0000)]

am c00359da: am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup

* commit 'c00359da05df0fdadf99e1eaabb4caab8233d75a':
AndroidManifest formatting cleanup

commit | commitdiff | tree

Spike Sprague [Tue, 29 Jul 2014 19:08:48 +0000 (19:08 +0000)]

am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup

* commit 'bbd1509219b5657faf4996afaafeea5a62577519':
AndroidManifest formatting cleanup

commit | commitdiff | tree

Spike Sprague [Tue, 29 Jul 2014 19:04:05 +0000 (19:04 +0000)]

am 6a8aceef: AndroidManifest formatting cleanup

* commit '6a8aceef5e9c886db04e82c913db7b8a719cdfc1':
AndroidManifest formatting cleanup

commit | commitdiff | tree

Sascha Haeberling [Tue, 29 Jul 2014 18:14:39 +0000 (11:14 -0700)]

[OC] Adds a class with common utility functions for capture modules.

Bug: 16654225

Change-Id: I7bc2eaaa928fd152d20777086abef984421cc320

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:36:25 +0000 (23:36 +0000)]

am f0b95e2e: (-s ours) am 1dc62fcb: (-s ours) am f2d2938e: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:27:39 +0000 (23:27 +0000)]

am 1dc62fcb: (-s ours) am f2d2938e: (-s ours) Import translations. DO NOT MERGE

* commit '1dc62fcbb69003eb1932781f4cdf1cdf7f869049':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:21:19 +0000 (23:21 +0000)]

am f2d2938e: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Spike Sprague [Mon, 28 Jul 2014 22:15:10 +0000 (15:15 -0700)]

AndroidManifest formatting cleanup

Change-Id: I279e764987fea743aa78575748a831e31ba28c0c

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 20:03:26 +0000 (13:03 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:34:54 +0000 (21:34 +0000)]

am 7619060b: am 8ad14279: am 47edeec6: am 2f92712c: re-added color and background entries for gcam

* commit '7619060bf592fb66f87147b0d0e58c4e11e37b77':
re-added color and background entries for gcam

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:30:37 +0000 (21:30 +0000)]

am 8ad14279: am 47edeec6: am 2f92712c: re-added color and background entries for gcam

* commit '8ad142798419c37f4801aee9c5e194e6e0e6bdae':
re-added color and background entries for gcam

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:27:16 +0000 (21:27 +0000)]

am 47edeec6: am 2f92712c: re-added color and background entries for gcam

* commit '47edeec6fc05942676e9eae5861ca177237b8392':
re-added color and background entries for gcam

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:21:10 +0000 (21:21 +0000)]

am 2f92712c: re-added color and background entries for gcam

* commit '2f92712cdb0598eead6631a0b8366a592c8c19c2':
re-added color and background entries for gcam

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:18:45 +0000 (21:18 +0000)]

am 3ed57173: am 50623dc1: am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit '3ed571735d8d5aa3e1776d55fb0dcd53fa1c482f':
added a mutate() call when loading LayerDrawables.

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 01:12:51 +0000 (01:12 +0000)]

Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

commit | commitdiff | tree

Sascha Haeberling [Wed, 30 Jul 2014 00:08:18 +0000 (17:08 -0700)]

Put conversion from string to size into SettingsManager.

This way we don't have to spread this logic throughout the codebase.

Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:12:52 +0000 (21:12 +0000)]

am 50623dc1: am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit '50623dc16d101d6633ffc068ced766d846f54a37':
added a mutate() call when loading LayerDrawables.

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:11:42 +0000 (14:11 -0700)]

re-added color and background entries for gcam

bug: 16567671
Change-Id: Ifbe7bd68f0f6c47f645b420ef35d6eb6478c4a7e

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:07:32 +0000 (21:07 +0000)]

am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit 'e70248ff6ad4ae0cb23ecd4b681a8d3b32198644':
added a mutate() call when loading LayerDrawables.

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 21:03:39 +0000 (21:03 +0000)]

am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit 'ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7':
added a mutate() call when loading LayerDrawables.

commit | commitdiff | tree

Spike Sprague [Fri, 25 Jul 2014 19:19:11 +0000 (12:19 -0700)]

added a mutate() call when loading LayerDrawables.

bug: 16566825
Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6

commit | commitdiff | tree

Qiwen Zhao [Fri, 25 Jul 2014 18:35:19 +0000 (11:35 -0700)]

reset to 32d3641 with history

commit | commitdiff | tree

Qiwen Zhao [Fri, 25 Jul 2014 18:34:30 +0000 (11:34 -0700)]

reset to 446edb9 with history

commit | commitdiff | tree

Qiwen Zhao [Fri, 25 Jul 2014 18:32:52 +0000 (11:32 -0700)]

reset to df5989b with history

commit | commitdiff | tree

Qiwen Zhao [Fri, 25 Jul 2014 17:29:31 +0000 (10:29 -0700)]

Reset to ub-camera-glacier at sha1 df5989b with history.

commit | commitdiff | tree

Sascha Haeberling [Fri, 25 Jul 2014 17:12:58 +0000 (17:12 +0000)]

am b538ef36: am 09ef7be7: am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit 'b538ef3628aff84fa871eeb07c0bb7311f689632':

commit | commitdiff | tree

Erin Dahlgren [Fri, 25 Jul 2014 17:12:58 +0000 (17:12 +0000)]

am 3e05d0ba: am dbb348ac: am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit '3e05d0ba5632a697c0c4555dbe1062d3a5fed944':

commit | commitdiff | tree

Baligh Uddin [Fri, 25 Jul 2014 17:12:57 +0000 (17:12 +0000)]

am 5199bd16: (-s ours) am 9082fab9: (-s ours) am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit '5199bd16488840aaa27cc889d4956e5f1e061916':

commit | commitdiff | tree

Sascha Haeberling [Fri, 25 Jul 2014 17:08:15 +0000 (17:08 +0000)]

am 09ef7be7: am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit '09ef7be7d70d93462b1d3588360fc9e7fb38e965':

commit | commitdiff | tree

Erin Dahlgren [Fri, 25 Jul 2014 17:08:14 +0000 (17:08 +0000)]

am dbb348ac: am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit 'dbb348ac3da33490295931bb40ce2b2ae0ed57d6':

commit | commitdiff | tree

Baligh Uddin [Fri, 25 Jul 2014 17:08:13 +0000 (17:08 +0000)]

am 9082fab9: (-s ours) am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit '9082fab9e46ca3a5e82917fb47940ca49730cdd3':

commit | commitdiff | tree

Sascha Haeberling [Fri, 25 Jul 2014 17:03:54 +0000 (17:03 +0000)]

am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit '67e71a3dd8c6b1e974e3235080fb99784d7e7ce3':

commit | commitdiff | tree

Erin Dahlgren [Fri, 25 Jul 2014 17:03:54 +0000 (17:03 +0000)]

am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit 'ee806b647f5a2c7b363245063ea22253aa06680c':

commit | commitdiff | tree

Baligh Uddin [Fri, 25 Jul 2014 17:03:53 +0000 (17:03 +0000)]

am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit '5993205fe867e2a48bf19fc066b9a5d6231c9ec6':

commit | commitdiff | tree

Sascha Haeberling [Fri, 25 Jul 2014 16:58:28 +0000 (16:58 +0000)]

am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit '7266b9c7fefe80ece12b44b129b49759c8d1ad90':

commit | commitdiff | tree

Erin Dahlgren [Fri, 25 Jul 2014 16:58:16 +0000 (16:58 +0000)]

am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit '82387f3da8eadb15d32e79f40e8ef917efebe9c3':

commit | commitdiff | tree

Baligh Uddin [Fri, 25 Jul 2014 16:58:08 +0000 (16:58 +0000)]

am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit 'ba0bccbf9124f5d6662c1421ceb965800309ffb8':

commit | commitdiff | tree

Alan Newberger [Thu, 24 Jul 2014 23:15:18 +0000 (23:15 +0000)]

Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier

commit | commitdiff | tree

Alan Newberger [Thu, 24 Jul 2014 22:55:37 +0000 (15:55 -0700)]

Ensure default focus mode is continuous-picture

The new Settings infrastructure created a bug where the default
focus mode was 'auto', it needs to be continuous-picture. Fixing
here. Also adding verbose logging to the focus manager, could be
helpful in the future.

Bug: 16536583
Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428

commit | commitdiff | tree

Spike Sprague [Thu, 24 Jul 2014 23:15:15 +0000 (23:15 +0000)]

Merge "ripple drawable on shutter button" into ub-camera-glacier

commit | commitdiff | tree

Spike Sprague [Sat, 19 Jul 2014 00:34:03 +0000 (17:34 -0700)]

ripple drawable on shutter button

bug: 16123188
Change-Id: I390279acb7a4599f1aeba71b415f1261b9a9b97b

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 21:48:33 +0000 (21:48 +0000)]

am 21b8cb69: (-s ours) Import translations. DO NOT MERGE

* commit '21b8cb696c05ef5207d290f3a1ed52453e58f525':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 10:36:34 +0000 (03:36 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 10:34:53 +0000 (03:34 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 10:33:58 +0000 (03:33 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Alan Newberger [Wed, 23 Jul 2014 18:25:07 +0000 (11:25 -0700)]

Upgrade mode index settings after mode indices were cleaned

Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml,
upgrades were found to crash when settings referred to the old, now nonexistent mode value.
This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the
new value. Tested and works properly with mode preservation.

Bug: 16467318
Change-Id: I1352a940285687af38290250d7a06b5b7c421338

commit | commitdiff | tree

Alan Newberger [Wed, 23 Jul 2014 01:46:41 +0000 (18:46 -0700)]

Modify Camera settings scope enforcement from crash to warning

Several bugs have appeared particularly for flash settings, where the app
is attempting to get a scope per the new SettingsManager, and the camera
is already closed meaning there is no valid scope. With this change, such
situations will be logged with call stack traces, so if we see deviant
user behavior we'll know the source. Monkeys should no longer trip settings
crashes with this change.

Bug: 16483952
Bug: 16491601
Change-Id: I26487bc58909a05183563f59ae3cfba571f2504e

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 03:44:25 +0000 (20:44 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 03:45:09 +0000 (20:45 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 21 Jul 2014 19:17:08 +0000 (19:17 +0000)]

am 64198199: (-s ours) am 042fa8ca: am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '64198199d26076855b2bfec0d380eaa7b6c7d1ca':
Remove deprecated locales - DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 21 Jul 2014 19:17:07 +0000 (19:17 +0000)]

am a2d9a999: (-s ours) am 24f048aa: (-s ours) am 16788cc3: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 20 Jul 2014 18:08:02 +0000 (18:08 +0000)]

am 042fa8ca: am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '042fa8ca909e0635360a39ed0b56b12e72340728':
Remove deprecated locales - DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 20 Jul 2014 18:06:49 +0000 (18:06 +0000)]

am 24f048aa: (-s ours) am 16788cc3: (-s ours) Import translations. DO NOT MERGE

* commit '24f048aaac7a24202f93262540bfe4576a2e555e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 20 Jul 2014 02:27:33 +0000 (02:27 +0000)]

am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit 'cec3a4bacb58ac44d8bc0baa5c3a1a6d1a48b0f4':
Remove deprecated locales - DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 19 Jul 2014 21:51:02 +0000 (21:51 +0000)]

am 16788cc3: (-s ours) Import translations. DO NOT MERGE

* commit '16788cc303637128cf37eaa2abea353239935908':
Import translations. DO NOT MERGE

packages/apps/Camera2

RSS Atom

About OSDN

Find Software

Develop Software

Help