OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translati...
Baligh Uddin [Sun, 6 Jul 2014 21:27:26 +0000 (21:27 +0000)]
am 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:28 +0000 (21:24 +0000)]
am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:15 +0000 (21:24 +0000)]
am aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 2ee019be: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:21 +0000 (21:21 +0000)]
am 2ee019be: (-s ours) Import translations. DO NOT MERGE

* commit '2ee019bee75241d3e1f338d04491900a65c1c79f':
  Import translations. DO NOT MERGE

9 years agoam cb0f330b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:08 +0000 (21:21 +0000)]
am cb0f330b: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam e6828fb6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:07 +0000 (21:21 +0000)]
am e6828fb6: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:08:18 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:06:58 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:06:20 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:00:18 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE

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

10 years agoChange HDR plus flash default to off.
Erin Dahlgren [Wed, 2 Jul 2014 17:39:17 +0000 (10:39 -0700)]
Change HDR plus flash default to off.

As Gcam is still experimenting with their flash setting,
turn it off so there is no accidental auto flash.

Change-Id: Id7a372a0b0123a43ff11d9a0ec8267e30d15a2b4

10 years agoam 02b9b9af: move intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:40:49 +0000 (18:40 +0000)]
am 02b9b9af: move intent review image view to proper spot in view hierachy

* commit '02b9b9af097ac7886ec1d23392cd87c9fbcb186f':
  move intent review image view to proper spot in view hierachy

10 years agomove intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:26:28 +0000 (11:26 -0700)]
move intent review image view to proper spot in view hierachy

bug: 15729563
Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a

10 years agoam d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
Sascha Häberling [Wed, 2 Jul 2014 18:16:27 +0000 (18:16 +0000)]
am d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake

* commit 'd2922674e622c924b288c42d8e468812ad548de2':
  Pass the real file length to MediaStore.

10 years agoam af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that...
Doris Liu [Wed, 2 Jul 2014 18:16:27 +0000 (18:16 +0000)]
am af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake

* commit 'af374822959b95dd8ede91a03fa43b9bcf60cd83':
  DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"

10 years agoam aa52b3d2: Prevent crash for when newData cannot be found.
Sascha Haeberling [Wed, 2 Jul 2014 18:16:26 +0000 (18:16 +0000)]
am aa52b3d2: Prevent crash for when newData cannot be found.

* commit 'aa52b3d28a0285b71be342158386422ed53244b2':
  Prevent crash for when newData cannot be found.

10 years agoam b46c1855: New blue for clings and tutorials graphics
Sascha Haeberling [Wed, 2 Jul 2014 17:38:50 +0000 (17:38 +0000)]
am b46c1855: New blue for clings and tutorials graphics

* commit 'b46c1855c48f1efe3268d7ba73d89032b9dfff09':
  New blue for clings and tutorials graphics

10 years agoPrevent crash for when newData cannot be found.
Sascha Haeberling [Tue, 1 Jul 2014 19:30:30 +0000 (12:30 -0700)]
Prevent crash for when newData cannot be found.

  Bug: 15842040

This should never happen, but could if e.g. there is a UI bug that
causes the 'done button on Photo Sphere / Panorama to be visible when no
actual session is active.

Change-Id: Iadd3c1786a4cb204d8a4d3222864aba2807ec36e

10 years agoNew blue for clings and tutorials graphics
Sascha Haeberling [Tue, 1 Jul 2014 16:21:26 +0000 (09:21 -0700)]
New blue for clings and tutorials graphics

  Bug: 15754001

Change-Id: I44f536dbd052aa896018660352732565ce792055

10 years agoMerge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant...
Doris Liu [Tue, 1 Jul 2014 21:13:55 +0000 (21:13 +0000)]
Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake

10 years agoDO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview...
Doris Liu [Tue, 1 Jul 2014 18:55:46 +0000 (18:55 +0000)]
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"

Since there is a small percentage of users still on K-MR1 as of June 30, we
will revert this CL for fishlake (only).

This reverts commit 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d.

Bug: 15986316

Change-Id: I10283032e2873d07a51cfc697801b04977b3b18f

10 years agoMerge "Pass the real file length to MediaStore." into ub-camera-fishlake
Sascha Häberling [Tue, 1 Jul 2014 21:45:28 +0000 (21:45 +0000)]
Merge "Pass the real file length to MediaStore." into ub-camera-fishlake

10 years agoPass the real file length to MediaStore.
Angus Kong [Fri, 27 Jun 2014 18:13:10 +0000 (11:13 -0700)]
Pass the real file length to MediaStore.

  Bug:15115507

And also a little code clean/rearrangement.

Change-Id: I65ceec4c0489f965473c29cad684190f966b9218

10 years agoam 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing...
Spike Sprague [Mon, 30 Jun 2014 22:28:22 +0000 (22:28 +0000)]
am 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review

* commit '9f3d01d9c5d2200882de76e309db55d74d950110':
  volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review

10 years agovolume button cancels ongoing countdown
Spike Sprague [Mon, 30 Jun 2014 21:52:57 +0000 (14:52 -0700)]
volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review

bug: 15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13

10 years agoam 0b3f9d51: Clean up foregrounding stats so that they are balanced with backgroundin...
Andy Huibers [Mon, 30 Jun 2014 20:59:24 +0000 (20:59 +0000)]
am 0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats.

* commit '0b3f9d515df7a36d6e73acd4900b2537f4e54c8d':
  Clean up foregrounding stats so that they are balanced with backgrounding stats.

10 years agoClean up foregrounding stats so that they are balanced with backgrounding stats.
Andy Huibers [Mon, 30 Jun 2014 19:47:37 +0000 (12:47 -0700)]
Clean up foregrounding stats so that they are balanced with backgrounding stats.

Change-Id: Ib694e8a98822cb475b5dfb2f92a56a34e31ae5dd

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Sat, 28 Jun 2014 02:59:47 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agoFix build.
Andy Huibers [Sat, 28 Jun 2014 00:29:23 +0000 (17:29 -0700)]
Fix build.

Change-Id: I463f525e6097f8705257c5d18a88689216e40123

10 years agoam 78e5a83a: Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 21:38:48 +0000 (21:38 +0000)]
am 78e5a83a: Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake

* commit '78e5a83a137a33452dd6500ddc60407bfe494bd2':
  fix Camera2 stubs for GoogleHelpHelper

10 years agoresolved conflicts for merge of deb09a7c to ub-camera-glacier
Erin Dahlgren [Fri, 27 Jun 2014 21:29:35 +0000 (14:29 -0700)]
resolved conflicts for merge of deb09a7c to ub-camera-glacier

Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d

10 years agoam 1dc99323: Updated resources to comply with GAR.
Sascha Haeberling [Fri, 27 Jun 2014 21:00:18 +0000 (21:00 +0000)]
am 1dc99323: Updated resources to comply with GAR.

* commit '1dc9932347ea735f8b4e06382d36af3cf65421e7':
  Updated resources to comply with GAR.

10 years agoUpdated resources to comply with GAR.
Sascha Haeberling [Fri, 27 Jun 2014 00:05:58 +0000 (17:05 -0700)]
Updated resources to comply with GAR.

  Bug: 15754001

Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971

10 years agoMerge "GoogleHelp launch edits." into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 21:07:58 +0000 (21:07 +0000)]
Merge "GoogleHelp launch edits." into ub-camera-fishlake

10 years agoGoogleHelp launch edits.
Erin Dahlgren [Fri, 27 Jun 2014 18:18:36 +0000 (11:18 -0700)]
GoogleHelp launch edits.

* Change Help to "Help & feedback"
* Move open source to the overflow menu in Help & feedback
* Remove send feedback
* Consolidate to one single group of settings (no General Settings and About)
* Put "Help & feedback" in the filmstrip overflow

Bug: 8426295
Change-Id: I3f0dad33b3e0c9ce150dce5c96cf7b9d7d7650da

10 years agoam 632eaafd: Pull Glide forward.
Sam Judd [Fri, 27 Jun 2014 03:04:51 +0000 (03:04 +0000)]
am 632eaafd: Pull Glide forward.

* commit '632eaafda53eb59b15c81ddeaf2080e6d8515f59':
  Pull Glide forward.

10 years agoPull Glide forward.
Sam Judd [Tue, 24 Jun 2014 20:31:02 +0000 (13:31 -0700)]
Pull Glide forward.

Bug: 15669246
Change-Id: Icdcc5cb7c3ec2bbf5b970ee95ea121e10ac341d7

10 years agoresolved conflicts for merge of b0870db3 to ub-camera-glacier
Sascha Haeberling [Thu, 26 Jun 2014 22:47:08 +0000 (15:47 -0700)]
resolved conflicts for merge of b0870db3 to ub-camera-glacier

Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Jun 2014 21:20:09 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 21:34:29 +0000 (21:34 +0000)]
Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake

10 years agofix Camera2 stubs for GoogleHelpHelper
Erin Dahlgren [Fri, 27 Jun 2014 21:33:57 +0000 (14:33 -0700)]
fix Camera2 stubs for GoogleHelpHelper

Change-Id: Iba9d55c22cf3e3811072b14f1f0e74e9bd3814cf

10 years agoam 57d4f74f: Ensure focusAndCapture() is called on the main thread.
Sascha Haeberling [Wed, 25 Jun 2014 18:27:59 +0000 (18:27 +0000)]
am 57d4f74f: Ensure focusAndCapture() is called on the main thread.

* commit '57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5':
  Ensure focusAndCapture() is called on the main thread.

10 years agoEnsure focusAndCapture() is called on the main thread.
Sascha Haeberling [Wed, 25 Jun 2014 18:05:49 +0000 (11:05 -0700)]
Ensure focusAndCapture() is called on the main thread.

  Bug: 15863231

Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad

10 years agoMerge "Clean-Up formatting." into ub-camera-fishlake
Sascha Haeberling [Wed, 25 Jun 2014 18:26:10 +0000 (18:26 +0000)]
Merge "Clean-Up formatting." into ub-camera-fishlake

10 years agoClean-Up formatting.
Sascha Haeberling [Wed, 25 Jun 2014 18:12:22 +0000 (11:12 -0700)]
Clean-Up formatting.

Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8

10 years agoam dc9aeb52: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Wed, 25 Jun 2014 02:55:14 +0000 (02:55 +0000)]
am dc9aeb52: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake

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

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 25 Jun 2014 02:51:54 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Wed, 25 Jun 2014 02:51:59 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake

10 years agoAdd metadata to capture and tap to focus events.
Andy Huibers [Thu, 19 Jun 2014 05:26:14 +0000 (22:26 -0700)]
Add metadata to capture and tap to focus events.

Bug: 15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225

10 years agoMerge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera...
Sol Boucher [Tue, 24 Jun 2014 18:45:10 +0000 (18:45 +0000)]
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier

10 years agoFix merge conflict.
Andy Huibers [Tue, 24 Jun 2014 17:46:36 +0000 (10:46 -0700)]
Fix merge conflict.

Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6

10 years agoam b7c7d9a0: Add metadata to capture and tap to focus events.
Andy Huibers [Tue, 24 Jun 2014 17:38:47 +0000 (17:38 +0000)]
am b7c7d9a0: Add metadata to capture and tap to focus events.

* commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
  Add metadata to capture and tap to focus events.

10 years agoam 03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera...
Andy Huibers [Tue, 24 Jun 2014 17:38:46 +0000 (17:38 +0000)]
am 03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake

* commit '03fd3baf01447f30246b095f816ce337562d15f7':
  Add maximum zoom level and time to view events.

10 years agoresolved conflicts for merge of e1547937 to ub-camera-glacier
Erin Dahlgren [Tue, 24 Jun 2014 17:13:01 +0000 (10:13 -0700)]
resolved conflicts for merge of e1547937 to ub-camera-glacier

Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73

10 years agoHard reset HDR off if HDR+ is supported.
Erin Dahlgren [Mon, 23 Jun 2014 22:17:07 +0000 (15:17 -0700)]
Hard reset HDR off if HDR+ is supported.

HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.

Bug: 15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a

10 years agoMerge "Add maximum zoom level and time to view events." into ub-camera-fishlake
Andy Huibers [Mon, 23 Jun 2014 23:31:56 +0000 (23:31 +0000)]
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake

10 years agoReplace uses of CameraDevice#getCameraInfos() and CameraInfo
Sol Boucher [Thu, 19 Jun 2014 22:03:18 +0000 (15:03 -0700)]
Replace uses of CameraDevice#getCameraInfos() and CameraInfo

This API 1--specific portability library method has been removed.  All
non-debugging direct uses of the Camera.CameraInfo class are also addressed by
this commit.

Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc

10 years agoAdd maximum zoom level and time to view events.
Andy Huibers [Tue, 20 May 2014 22:17:06 +0000 (15:17 -0700)]
Add maximum zoom level and time to view events.

Bug: 15646701
Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c

10 years agoam c37ab9dd: (-s ours) DO NOT MERGE - Remove Material from Fishlake. But not glacier.
Sascha Haeberling [Mon, 23 Jun 2014 20:46:18 +0000 (20:46 +0000)]
am c37ab9dd: (-s ours) DO NOT MERGE - Remove Material from Fishlake. But not glacier.

* commit 'c37ab9dd8222db47f9aac89d4d4bb24357ab90f1':
  DO NOT MERGE - Remove Material from Fishlake. But not glacier.

10 years agoDO NOT MERGE - Remove Material from Fishlake. But not glacier.
Sascha Haeberling [Mon, 23 Jun 2014 20:34:24 +0000 (13:34 -0700)]
DO NOT MERGE - Remove Material from Fishlake. But not glacier.

  Bug: 15757384

Change-Id: I3367a96e1059ab4e0f2fc65353a13853a33767ca

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Jun 2014 19:41:18 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Jun 2014 19:39:43 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Migrate to use new CameraSettings." into ub-camera-glacier
Angus Kong [Mon, 23 Jun 2014 18:59:25 +0000 (18:59 +0000)]
Merge "Migrate to use new CameraSettings." into ub-camera-glacier

10 years agoam ecf1014c: Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into...
Sascha Häberling [Sat, 21 Jun 2014 00:04:02 +0000 (00:04 +0000)]
am ecf1014c: Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera-fishlake

* commit 'ecf1014c0349e42cb7689eb61fb33d91aa69590e':
  Revert "Memory window analysis in Camera2. Bug: 13280671"

10 years agoam 5802ea97: (-s ours) Protect settings logging with a verbose flag
Erin Dahlgren [Fri, 20 Jun 2014 22:10:18 +0000 (22:10 +0000)]
am 5802ea97: (-s ours) Protect settings logging with a verbose flag

* commit '5802ea97c0bab7cf17e3567ea31ec943e812b31d':
  Protect settings logging with a verbose flag

10 years agoProtect settings logging with a verbose flag
Erin Dahlgren [Fri, 20 Jun 2014 21:58:18 +0000 (14:58 -0700)]
Protect settings logging with a verbose flag

Change-Id: Icacc7c01971ed2077b9e5999e042a2b9ba031cfd

10 years agoMerge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera...
Sascha Häberling [Fri, 20 Jun 2014 23:49:20 +0000 (23:49 +0000)]
Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera-fishlake

10 years agoRevert "Memory window analysis in Camera2. Bug: 13280671"
Sascha Häberling [Fri, 20 Jun 2014 23:45:29 +0000 (23:45 +0000)]
Revert "Memory window analysis in Camera2. Bug: 13280671"

This seems to introduce jank in the app.

This reverts commit b4f3483bfb5c2edcaefd0b44e84bb080e46502c8.

Change-Id: Iad87e32a411eae1e2fdf09d6829c0e006a8eb5f8

10 years agoam 28973902: (-s ours) dump default and global shared preferences
Erin Dahlgren [Fri, 20 Jun 2014 19:46:32 +0000 (19:46 +0000)]
am 28973902: (-s ours) dump default and global shared preferences

* commit '28973902b2fb8158ece59282218938ca3e060f6b':
  dump default and global shared preferences

10 years agodump default and global shared preferences
Erin Dahlgren [Fri, 20 Jun 2014 19:30:56 +0000 (12:30 -0700)]
dump default and global shared preferences

Change-Id: Ia9f3780dc6a0725badb3214fc9388fab9007dbb5

10 years agoam 2b04dc42: Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera...
Kevin Gabayan [Fri, 20 Jun 2014 03:37:47 +0000 (03:37 +0000)]
am 2b04dc42: Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake

* commit '2b04dc42f691257742a7f73f4d9e803ea4a0d7ed':
  Memory window analysis in Camera2. Bug: 13280671

10 years agoam 7d0c9f68: (-s ours) am 0e343cde: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 19:19:09 +0000 (19:19 +0000)]
am 7d0c9f68: (-s ours) am 0e343cde: (-s ours) Import translations. DO NOT MERGE

* commit '7d0c9f68718f4d631b24d105144f252c928c7e71':
  Import translations. DO NOT MERGE

10 years agoam c9feac67: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Thu, 19 Jun 2014 19:16:01 +0000 (19:16 +0000)]
am c9feac67: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake

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

10 years agoam 0e343cde: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 19:15:49 +0000 (19:15 +0000)]
am 0e343cde: (-s ours) Import translations. DO NOT MERGE

* commit '0e343cde9c36a7f3d4cc192839d4938cc048159b':
  Import translations. DO NOT MERGE

10 years agoMemory window analysis in Camera2.
Kevin Gabayan [Thu, 17 Apr 2014 20:56:10 +0000 (13:56 -0700)]
Memory window analysis in Camera2.
Bug: 13280671

Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f

10 years agoMigrate to use new CameraSettings.
Angus Kong [Mon, 16 Jun 2014 23:07:28 +0000 (16:07 -0700)]
Migrate to use new CameraSettings.

Totally get rid of Camera.Parameters.

Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340

10 years agoFixing bad manual merge to fix build.
Sascha Haeberling [Thu, 19 Jun 2014 17:19:30 +0000 (10:19 -0700)]
Fixing bad manual merge to fix build.

Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3

10 years agoMerge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake
Kevin Gabayan [Thu, 19 Jun 2014 21:28:06 +0000 (21:28 +0000)]
Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake

10 years agoresolved conflicts for merge of 1bf0889d to ub-camera-glacier
Sascha Haeberling [Thu, 19 Jun 2014 07:38:52 +0000 (00:38 -0700)]
resolved conflicts for merge of 1bf0889d to ub-camera-glacier

Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e

10 years agoFix the build.
Angus Kong [Thu, 19 Jun 2014 00:20:34 +0000 (17:20 -0700)]
Fix the build.

Change-Id: Id8acdcfa54721042e61e16a9c50381e61414f778

10 years agoNew Settings API
Erin Dahlgren [Fri, 13 Jun 2014 21:12:08 +0000 (14:12 -0700)]
New Settings API

Based on discussions from last week and comments on the design doc,
this api begins to implement the following:

1. Adds a "Scope" variable to api, which tells the SettingsManager
   whether the setting can be stored globally (so that it is visible
   to all parts of the app), or per-camera, or per-module, or per-
   custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
   to make it easy to add new settings/defaults from third party
   modules.
3. Stores all settings as strings, to avoid upgrade errors, and
   handles casting to type requested.  Only String, Integer, and
   boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
   argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
   values of a setting.  Then a user can request the default or
   possible values of a setting at any time.

Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425

10 years agoRemote shutter should focus before taking a photo.
Sascha Haeberling [Wed, 18 Jun 2014 16:38:06 +0000 (09:38 -0700)]
Remote shutter should focus before taking a photo.

  Bug: 13929364

Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Jun 2014 20:33:46 +0000 (13:33 -0700)]
Import translations. DO NOT MERGE

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

10 years agoRemove cameradevice subpackage and point references at ex library
Sol Boucher [Tue, 17 Jun 2014 21:05:08 +0000 (14:05 -0700)]
Remove cameradevice subpackage and point references at ex library

This code is being relocated into frameworks/ex for availability to other apps.

Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Thu, 19 Jun 2014 19:13:43 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Jun 2014 20:36:04 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Thu, 19 Jun 2014 19:13:48 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Jun 2014 20:34:33 +0000 (13:34 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second...
Kevin Gabayan [Tue, 17 Jun 2014 18:19:59 +0000 (18:19 +0000)]
am 09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake

* commit '09a46ccb10504579417609d2486dc28e92458bf7':
  MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601

10 years agoClarify filmstrip accessibility strings and comments
Spike Sprague [Tue, 17 Jun 2014 18:01:05 +0000 (11:01 -0700)]
Clarify filmstrip accessibility strings and comments

bug: 15600867
bug: 15595791
bug: 15586834
Change-Id: Ic20b693a85df0c76cea7b175f561a60d82b8d446

10 years agoam 18179f40: (-s ours) am e2a0db87: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Jun 2014 14:32:01 +0000 (14:32 +0000)]
am 18179f40: (-s ours) am e2a0db87: (-s ours) Import translations. DO NOT MERGE

* commit '18179f40c7c4e8b893354b9b17ae6b6b1b412b8a':
  Import translations. DO NOT MERGE

10 years agoam e2a0db87: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Jun 2014 14:29:20 +0000 (14:29 +0000)]
am e2a0db87: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam cae93db7: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Jun 2014 14:28:44 +0000 (14:28 +0000)]
am cae93db7: (-s ours) Import translations. DO NOT MERGE

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

10 years agoMerge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug...
Kevin Gabayan [Tue, 17 Jun 2014 18:17:05 +0000 (18:17 +0000)]
Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake

10 years agoMotionManager for motion-aware focus unlock in Camera2. Second revision.
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug: 14222601

Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Jun 2014 20:15:31 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Jun 2014 20:14:06 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Jun 2014 20:13:21 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam daebadaa: (-s ours) am 65345934: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Jun 2014 13:20:13 +0000 (13:20 +0000)]
am daebadaa: (-s ours) am 65345934: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 65345934: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Jun 2014 13:17:28 +0000 (13:17 +0000)]
am 65345934: (-s ours) Import translations. DO NOT MERGE

* commit '653459343b06a87b6be5fe329365c37352fb182d':
  Import translations. DO NOT MERGE