OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam a303a71f: Merge "A test for media details." into gb-ub-photos-denali
Angus Kong [Thu, 20 Feb 2014 17:31:32 +0000 (09:31 -0800)]
am a303a71f: Merge "A test for media details." into gb-ub-photos-denali

* commit 'a303a71ff636535e59bd356bda40e9a324699357':
  A test for media details.

10 years agoMerge "A test for media details." into gb-ub-photos-denali
Angus Kong [Thu, 20 Feb 2014 17:28:38 +0000 (17:28 +0000)]
Merge "A test for media details." into gb-ub-photos-denali

10 years agoA test for media details.
Angus Kong [Thu, 20 Feb 2014 17:18:09 +0000 (09:18 -0800)]
A test for media details.

Change-Id: If2615de75ed555c34316686de536d3289c834e75

10 years agoam 791f211c: Merge "Don\'t show flash mode option if it\'s never supported." into...
Erin Dahlgren [Thu, 20 Feb 2014 03:08:27 +0000 (19:08 -0800)]
am 791f211c: Merge "Don\'t show flash mode option if it\'s never supported." into gb-ub-photos-denali

* commit '791f211c87d0e15e3264086a5ea75ff9066aa177':
  Don't show flash mode option if it's never supported.

10 years agoMerge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali
Erin Dahlgren [Thu, 20 Feb 2014 03:06:21 +0000 (03:06 +0000)]
Merge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali

10 years agoam 0868a09e: Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali
Doris Liu [Thu, 20 Feb 2014 03:01:21 +0000 (19:01 -0800)]
am 0868a09e: Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali

* commit '0868a09ecd0fb17e63efae3b8b3b694bda32ca20':
  Hide focus overlay when exiting a mode

10 years agoMerge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali
Doris Liu [Thu, 20 Feb 2014 02:59:41 +0000 (02:59 +0000)]
Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali

10 years agoDon't show flash mode option if it's never supported.
Erin Dahlgren [Thu, 20 Feb 2014 01:23:01 +0000 (17:23 -0800)]
Don't show flash mode option if it's never supported.

The motivation behind this design is that if the camera id
preference is cleared on every upgrade, we should be able to
obtain the flash support setting before ever switching to front
camera.

Bug: 12192238
Change-Id: I01dbcf2f614e7359fd456665e58c922b347a46da

10 years agoam b86a02cd: Merge "Filmstrip peek animation." into gb-ub-photos-denali
Angus Kong [Thu, 20 Feb 2014 01:47:43 +0000 (17:47 -0800)]
am b86a02cd: Merge "Filmstrip peek animation." into gb-ub-photos-denali

* commit 'b86a02cddc807ac2f7524b786ff3c589cc340353':
  Filmstrip peek animation.

10 years agoMerge "Filmstrip peek animation." into gb-ub-photos-denali
Angus Kong [Thu, 20 Feb 2014 01:46:16 +0000 (01:46 +0000)]
Merge "Filmstrip peek animation." into gb-ub-photos-denali

10 years agoHide focus overlay when exiting a mode
Doris Liu [Wed, 19 Feb 2014 22:12:06 +0000 (14:12 -0800)]
Hide focus overlay when exiting a mode

Bug: 13005220
Change-Id: I48bc32b9137a850aefef43af44537b2c892a74a2

10 years agoam 71a74296: Bring back panorama indicator support.
Erin Dahlgren [Wed, 19 Feb 2014 22:09:23 +0000 (14:09 -0800)]
am 71a74296: Bring back panorama indicator support.

* commit '71a742968e6b9efe2f570e2876f67330bfddf8c1':
  Bring back panorama indicator support.

10 years agoBring back panorama indicator support.
Erin Dahlgren [Wed, 19 Feb 2014 20:50:05 +0000 (12:50 -0800)]
Bring back panorama indicator support.

Bug: 13023569
Bug: 12977732
Change-Id: I188a2f1aa7fa70cd0c7a803707c74a9b23f7203b

10 years agoam c179d4ae: Merge "Change mode drawer text to 16sp" into gb-ub-photos-denali
Doris Liu [Wed, 19 Feb 2014 20:12:30 +0000 (12:12 -0800)]
am c179d4ae: Merge "Change mode drawer text to 16sp" into gb-ub-photos-denali

* commit 'c179d4ae5c7ba46f8a198473f812ce252e218d26':
  Change mode drawer text to 16sp

10 years agoMerge "Change mode drawer text to 16sp" into gb-ub-photos-denali
Doris Liu [Wed, 19 Feb 2014 20:09:56 +0000 (20:09 +0000)]
Merge "Change mode drawer text to 16sp" into gb-ub-photos-denali

10 years agoChange mode drawer text to 16sp
Doris Liu [Wed, 19 Feb 2014 19:04:39 +0000 (11:04 -0800)]
Change mode drawer text to 16sp

Bug: 12994786
Change-Id: Id4c9f1f573f7a19cc5450df599c0d36f7de2f94f

10 years agoam be08ab09: Merge "Install a release dialog at start-up if necessary." into gb-ub...
Sascha Haeberling [Wed, 19 Feb 2014 18:54:18 +0000 (10:54 -0800)]
am be08ab09: Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali

* commit 'be08ab09c3f2228e07cace087d200169bbd3958e':
  Install a release dialog at start-up if necessary.

10 years agoMerge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali
Sascha Haeberling [Wed, 19 Feb 2014 18:52:16 +0000 (18:52 +0000)]
Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali

10 years agoam 477d93d6: Merge "Rename Refocus to Lens Blur" into gb-ub-photos-denali
Sascha Haeberling [Wed, 19 Feb 2014 18:49:12 +0000 (10:49 -0800)]
am 477d93d6: Merge "Rename Refocus to Lens Blur" into gb-ub-photos-denali

* commit '477d93d6c50f1866ba142c2282efa6b8fea5e2c1':
  Rename Refocus to Lens Blur

10 years agoMerge "Rename Refocus to Lens Blur" into gb-ub-photos-denali
Sascha Haeberling [Wed, 19 Feb 2014 18:46:35 +0000 (18:46 +0000)]
Merge "Rename Refocus to Lens Blur" into gb-ub-photos-denali

10 years agoRename Refocus to Lens Blur
Sascha Haeberling [Wed, 19 Feb 2014 18:43:27 +0000 (10:43 -0800)]
Rename Refocus to Lens Blur

  Bug: 13095859

Change-Id: I20744aa0297445b78398937abcb517ec7de1e731

10 years agoam 6514fd91: Merge "Update mode cover icon assets and size" into gb-ub-photos-denali
Doris Liu [Wed, 19 Feb 2014 18:26:05 +0000 (10:26 -0800)]
am 6514fd91: Merge "Update mode cover icon assets and size" into gb-ub-photos-denali

* commit '6514fd911e70b6ee679563ce25300876a719c67a':
  Update mode cover icon assets and size

10 years agoMerge "Update mode cover icon assets and size" into gb-ub-photos-denali
Doris Liu [Wed, 19 Feb 2014 18:22:31 +0000 (18:22 +0000)]
Merge "Update mode cover icon assets and size" into gb-ub-photos-denali

10 years agoInstall a release dialog at start-up if necessary.
Sascha Haeberling [Wed, 19 Feb 2014 16:39:28 +0000 (08:39 -0800)]
Install a release dialog at start-up if necessary.

  Bug: 11984630

Change-Id: I0619c82458b6f2d2dc4c9cbb8fca3a11b75a9ad5

10 years agoam ceb24012: Update assets of filmstrip controls
Angus Kong [Wed, 19 Feb 2014 04:55:30 +0000 (20:55 -0800)]
am ceb24012: Update assets of filmstrip controls

* commit 'ceb24012c795d85f9197fd4be7130821fe9ecb61':
  Update assets of filmstrip controls

10 years agoUpdate assets of filmstrip controls
Angus Kong [Wed, 19 Feb 2014 03:31:08 +0000 (19:31 -0800)]
Update assets of filmstrip controls

bug:13027163
Change-Id: I7a19a4ef35358566717e816a85a0ffa77ca7e48a

10 years agoUpdate mode cover icon assets and size
Doris Liu [Fri, 14 Feb 2014 22:14:46 +0000 (14:14 -0800)]
Update mode cover icon assets and size

Also increase the fade out duration.
Bug: 12967901
Change-Id: I9573b234ad0c9123f5edc6cd40c115897ba14177

10 years agoam 7785b26b: Merge "Support panorama orientation toggle in mode options." into gb...
Erin Dahlgren [Tue, 18 Feb 2014 23:27:32 +0000 (15:27 -0800)]
am 7785b26b: Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali

* commit '7785b26b493b315da0a31c4a0a334d1d891ea9f4':
  Support panorama orientation toggle in mode options.

10 years agoMerge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali
Erin Dahlgren [Tue, 18 Feb 2014 23:25:17 +0000 (23:25 +0000)]
Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali

10 years agoam 6fc361e5: Merge "adding larger confirm button assets" into gb-ub-photos-denali
Spike Sprague [Tue, 18 Feb 2014 22:45:35 +0000 (14:45 -0800)]
am 6fc361e5: Merge "adding larger confirm button assets" into gb-ub-photos-denali

* commit '6fc361e520896a136458c27095307345cb0a63d1':
  adding larger confirm button assets

10 years agoMerge "adding larger confirm button assets" into gb-ub-photos-denali
Spike Sprague [Tue, 18 Feb 2014 22:41:08 +0000 (22:41 +0000)]
Merge "adding larger confirm button assets" into gb-ub-photos-denali

10 years agoadding larger confirm button assets
Spike Sprague [Tue, 18 Feb 2014 22:37:53 +0000 (14:37 -0800)]
adding larger confirm button assets

bug: 12969738
Change-Id: Ib65d26580fe86c909a4f8929bc440651e8348da4

10 years agoam 5842607d: Change gear icon background and implement pressed state
Doris Liu [Tue, 18 Feb 2014 22:02:08 +0000 (14:02 -0800)]
am 5842607d: Change gear icon background and implement pressed state

* commit '5842607d1b9ec2b5e751a8aaf43ff97cc3f85d22':
  Change gear icon background and implement pressed state

10 years agoChange gear icon background and implement pressed state
Doris Liu [Fri, 14 Feb 2014 23:42:57 +0000 (15:42 -0800)]
Change gear icon background and implement pressed state

Bug: 13004843
Bug: 13005562
Change-Id: I18b44283bb337ca0bb3eb4aae923398a8ac4bfbb

10 years agoam 1d4fe644: new minumum bottom bar height
Spike Sprague [Tue, 18 Feb 2014 21:46:01 +0000 (13:46 -0800)]
am 1d4fe644: new minumum bottom bar height

* commit '1d4fe64441b8384b3fbeed545f66675a16735074':
  new minumum bottom bar height

10 years agonew minumum bottom bar height
Spike Sprague [Tue, 18 Feb 2014 19:24:09 +0000 (11:24 -0800)]
new minumum bottom bar height

bug: 12014742
Change-Id: I1761591c26eff716d30c824f157f7a4dbce7f0d7

10 years agoSupport panorama orientation toggle in mode options.
Erin Dahlgren [Tue, 18 Feb 2014 19:20:34 +0000 (11:20 -0800)]
Support panorama orientation toggle in mode options.

Bug: 12977732
Change-Id: I945d53e1f0a6e3ff4e831c9907936f4d4456def6

10 years agoFilmstrip peek animation.
Angus Kong [Sat, 18 Jan 2014 01:23:59 +0000 (17:23 -0800)]
Filmstrip peek animation.

First version.

bug:12451161
Change-Id: Ie49314569bf607efd9220977ad5ffb1ca26d161c

10 years agoam 4bf57877: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 18 Feb 2014 04:43:15 +0000 (20:43 -0800)]
am 4bf57877: (-s ours) Import translations. DO NOT MERGE

* commit '4bf57877b1a546fbc07f84834826935f50dbb165':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 18 Feb 2014 00:11:06 +0000 (16:11 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 18 Feb 2014 00:09:56 +0000 (16:09 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 9ec6c49e: Rotate three dots in landscape to make position sticky.
Erin Dahlgren [Fri, 14 Feb 2014 22:35:50 +0000 (14:35 -0800)]
am 9ec6c49e: Rotate three dots in landscape to make position sticky.

* commit '9ec6c49e78715c63d9df71fa184761e47639e929':
  Rotate three dots in landscape to make position sticky.

10 years agoRotate three dots in landscape to make position sticky.
Erin Dahlgren [Fri, 14 Feb 2014 22:14:18 +0000 (14:14 -0800)]
Rotate three dots in landscape to make position sticky.

Bug: 12369666
Change-Id: Iae8181c6656efce9de6701a4faf254be8d9396f7

10 years agoam 0dfec639: Merge "Make grid lines more transparent to fake blending." into gb-ub...
Erin Dahlgren [Fri, 14 Feb 2014 21:57:24 +0000 (13:57 -0800)]
am 0dfec639: Merge "Make grid lines more transparent to fake blending." into gb-ub-photos-denali

* commit '0dfec63991916549efee10a3663de4c2afce2948':
  Make grid lines more transparent to fake blending.

10 years agoam f5f1a1b6: Merge "Add Licenses Activity support." into gb-ub-photos-denali
Sascha Haeberling [Fri, 14 Feb 2014 21:57:23 +0000 (13:57 -0800)]
am f5f1a1b6: Merge "Add Licenses Activity support." into gb-ub-photos-denali

* commit 'f5f1a1b63630e9512801412ef32a6cda7b227a42':
  Add Licenses Activity support.

10 years agoMerge "Make grid lines more transparent to fake blending." into gb-ub-photos-denali
Erin Dahlgren [Fri, 14 Feb 2014 21:32:47 +0000 (21:32 +0000)]
Merge "Make grid lines more transparent to fake blending." into gb-ub-photos-denali

10 years agoMerge "Add Licenses Activity support." into gb-ub-photos-denali
Sascha Haeberling [Fri, 14 Feb 2014 21:26:28 +0000 (21:26 +0000)]
Merge "Add Licenses Activity support." into gb-ub-photos-denali

10 years agoam 818e1f17: Merge "Settings Activity needs existant label." into gb-ub-photos-denali
Sascha Haeberling [Fri, 14 Feb 2014 20:50:51 +0000 (12:50 -0800)]
am 818e1f17: Merge "Settings Activity needs existant label." into gb-ub-photos-denali

* commit '818e1f174cf7e1d77e9e594126d234fe6ad8c8b1':
  Settings Activity needs existant label.

10 years agoMake grid lines more transparent to fake blending.
Erin Dahlgren [Fri, 14 Feb 2014 18:57:30 +0000 (10:57 -0800)]
Make grid lines more transparent to fake blending.

Bug: 12970319
Change-Id: I4f460d704d0a5f43bb2f5e92df63beab259e3d2f

10 years agoMerge "Settings Activity needs existant label." into gb-ub-photos-denali
Sascha Haeberling [Fri, 14 Feb 2014 20:47:16 +0000 (20:47 +0000)]
Merge "Settings Activity needs existant label." into gb-ub-photos-denali

10 years agoam cb87251c: Merge "Remove grid lines indicator." into gb-ub-photos-denali
Erin Dahlgren [Fri, 14 Feb 2014 19:28:24 +0000 (11:28 -0800)]
am cb87251c: Merge "Remove grid lines indicator." into gb-ub-photos-denali

* commit 'cb87251c72cf90bea9e05bcecb91fbcb743d250b':
  Remove grid lines indicator.

10 years agoam 537c8a92: Do not hide mode drawer when settings button is clicked
Doris Liu [Fri, 14 Feb 2014 19:28:23 +0000 (11:28 -0800)]
am 537c8a92: Do not hide mode drawer when settings button is clicked

* commit '537c8a92385476aac360e41ad0306001ad73974c':
  Do not hide mode drawer when settings button is clicked

10 years agoMerge "Remove grid lines indicator." into gb-ub-photos-denali
Erin Dahlgren [Fri, 14 Feb 2014 19:13:41 +0000 (19:13 +0000)]
Merge "Remove grid lines indicator." into gb-ub-photos-denali

10 years agoRemove grid lines indicator.
Erin Dahlgren [Fri, 14 Feb 2014 19:01:31 +0000 (11:01 -0800)]
Remove grid lines indicator.

Bug: 12990795
Change-Id: Ibc25050523a0ea61cb6ec000d5dae02755a31016

10 years agoDo not hide mode drawer when settings button is clicked
Doris Liu [Fri, 14 Feb 2014 18:25:30 +0000 (10:25 -0800)]
Do not hide mode drawer when settings button is clicked

Change-Id: I4eefdbca124ee3656913877302cf32d32a6e9ec1

10 years agoSettings Activity needs existant label.
Sascha Haeberling [Fri, 14 Feb 2014 11:05:13 +0000 (12:05 +0100)]
Settings Activity needs existant label.

  Bug: 13016139

Change-Id: Iafa57e6385a39959fb18a674d5b030bd59a9104f

10 years agoAdd Licenses Activity support.
Sascha Haeberling [Fri, 14 Feb 2014 10:05:04 +0000 (11:05 +0100)]
Add Licenses Activity support.

  Bug: 13018845

Change-Id: I195d19da5430aa1c9ced068931be69d48d95efc0

10 years agoam 389ed60d: removing level 1 button backround circles
Spike Sprague [Fri, 14 Feb 2014 00:02:31 +0000 (16:02 -0800)]
am 389ed60d: removing level 1 button backround circles

* commit '389ed60d8d58485df14c340649a1e24d12f7ae61':
  removing level 1 button backround circles

10 years agoremoving level 1 button backround circles
Spike Sprague [Thu, 13 Feb 2014 19:31:25 +0000 (11:31 -0800)]
removing level 1 button backround circles

Change-Id: I4ae7eae6ad80288f7113ad0480adc60c92c6c9a2

10 years agoam d849d2ba: Merge "Hide focus ring when auto focusing in camera and video" into...
Doris Liu [Thu, 13 Feb 2014 23:25:57 +0000 (15:25 -0800)]
am d849d2ba: Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali

* commit 'd849d2ba5f3d4ec6773d87dd16a89833a86a7856':
  Hide focus ring when auto focusing in camera and video

10 years agoam a84a728d: doubling padding on intent capture review cancel and retake buttons
Spike Sprague [Thu, 13 Feb 2014 23:25:57 +0000 (15:25 -0800)]
am a84a728d: doubling padding on intent capture review cancel and retake buttons

* commit 'a84a728d17c439d83a6ebd78e3e54b8480804600':
  doubling padding on intent capture review cancel and retake buttons

10 years agoMerge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos...
Doris Liu [Thu, 13 Feb 2014 23:24:54 +0000 (23:24 +0000)]
Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali

10 years agodoubling padding on intent capture review cancel and retake buttons
Spike Sprague [Thu, 13 Feb 2014 18:35:37 +0000 (10:35 -0800)]
doubling padding on intent capture review cancel and retake buttons

bug: 13006473
Change-Id: I881cc714c6a0fe9b1e4eebca123b0873f47a837f

10 years agoHide focus ring when auto focusing in camera and video
Doris Liu [Thu, 13 Feb 2014 22:26:09 +0000 (14:26 -0800)]
Hide focus ring when auto focusing in camera and video

Bug: 12467152
Change-Id: If3c44f6b424d9796a937387d48e3dfd0dd161182

10 years agoam 653be9be: migrate secure cover to neutral background
Alan Newberger [Thu, 13 Feb 2014 17:42:40 +0000 (09:42 -0800)]
am 653be9be: migrate secure cover to neutral background

* commit '653be9be1f66ad6d14b2c45e6283c68aeb3216a1':
  migrate secure cover to neutral background

10 years agomigrate secure cover to neutral background
Alan Newberger [Thu, 13 Feb 2014 17:35:56 +0000 (09:35 -0800)]
migrate secure cover to neutral background

screen covers were migrated to use a neutral background, but the static
lockscreen cover was not updated. fixing here.

Bug: 12954790
Change-Id: I352925959307d2622fce5d1af8374ff8a9e2bb27

10 years agoam 12c9e155: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 13 Feb 2014 06:39:53 +0000 (22:39 -0800)]
am 12c9e155: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

* commit '12c9e155a1070d026a9e69f1706c4acd289d9eec':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 13 Feb 2014 06:35:21 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Thu, 13 Feb 2014 06:35:03 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

10 years agoam 8b6c3e04: Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali
Doris Liu [Wed, 12 Feb 2014 23:47:14 +0000 (15:47 -0800)]
am 8b6c3e04: Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali

* commit '8b6c3e04857a209e5a2e55ef837f34d9e8abc111':
  Center mode drawer in uncovered preview

10 years agoMerge "Center mode drawer in uncovered preview" into gb-ub-photos-denali
Doris Liu [Wed, 12 Feb 2014 23:41:15 +0000 (23:41 +0000)]
Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali

10 years agoCenter mode drawer in uncovered preview
Doris Liu [Wed, 12 Feb 2014 19:14:08 +0000 (11:14 -0800)]
Center mode drawer in uncovered preview

Also align the mode drawer to the left edge of the preview

Bug: 12974095
Bug: 12971043

Change-Id: Ic7b9cb95352cba52d3ccf6c09667476f2ea04d69

10 years agoam c919ef37: Merge "Separate button references now that options are centered." into...
Erin Dahlgren [Wed, 12 Feb 2014 22:07:14 +0000 (14:07 -0800)]
am c919ef37: Merge "Separate button references now that options are centered." into gb-ub-photos-denali

* commit 'c919ef37fd3b8c17ebbcfc2107da0a7cb52a0878':
  Separate button references now that options are centered.

10 years agoMerge "Separate button references now that options are centered." into gb-ub-photos...
Erin Dahlgren [Wed, 12 Feb 2014 22:04:36 +0000 (22:04 +0000)]
Merge "Separate button references now that options are centered." into gb-ub-photos-denali

10 years agoam 26b02441: Hide mode options overlay during video capture.
Erin Dahlgren [Wed, 12 Feb 2014 21:56:00 +0000 (13:56 -0800)]
am 26b02441: Hide mode options overlay during video capture.

* commit '26b024414efe17ca1afd9a2acfb77847d6c301df':
  Hide mode options overlay during video capture.

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Feb 2014 21:06:56 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Feb 2014 21:05:36 +0000 (13:05 -0800)]
Import translations. DO NOT MERGE

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

10 years agoHide mode options overlay during video capture.
Erin Dahlgren [Wed, 12 Feb 2014 20:29:28 +0000 (12:29 -0800)]
Hide mode options overlay during video capture.

Bug: 12976883
Change-Id: Ie832ebfaab74c80d1af45a7ca0ae853ebf179048

10 years agoam c893312b: Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali
Seth Raphael [Wed, 12 Feb 2014 20:05:37 +0000 (12:05 -0800)]
am c893312b: Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali

* commit 'c893312b7639d1e9c9c73e29bbb4470e8b8147e3':
  Give Smart Camera a signal to start

10 years agoam e8855fae: Merge "Swap in new focus ring assets and increase the size" into gb...
Seth Raphael [Wed, 12 Feb 2014 20:05:37 +0000 (12:05 -0800)]
am e8855fae: Merge "Swap in new focus ring assets and increase the size" into gb-ub-photos-denali

* commit 'e8855fae23c7efb6ac091a78ef96feaf542a42d3':
  Swap in new focus ring assets and increase the size

10 years agoMerge "Give Smart Camera a signal to start" into gb-ub-photos-denali
Seth Raphael [Wed, 12 Feb 2014 20:04:52 +0000 (20:04 +0000)]
Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali

10 years agoGive Smart Camera a signal to start
Seth Raphael [Thu, 6 Feb 2014 22:49:47 +0000 (14:49 -0800)]
Give Smart Camera a signal to start

Change-Id: I1b31d4cbf81a5865ef0807b07df0f644fa871247

10 years agoMerge "Swap in new focus ring assets and increase the size" into gb-ub-photos-denali
Seth Raphael [Wed, 12 Feb 2014 20:03:21 +0000 (20:03 +0000)]
Merge "Swap in new focus ring assets and increase the size" into gb-ub-photos-denali

10 years agoSwap in new focus ring assets and increase the size
Doris Liu [Wed, 12 Feb 2014 19:37:19 +0000 (11:37 -0800)]
Swap in new focus ring assets and increase the size

Bug: 12954917
Change-Id: I1d9dda5033a5b80bdfa331c161115f237c1dc895

10 years agoSeparate button references now that options are centered.
Erin Dahlgren [Wed, 12 Feb 2014 18:45:24 +0000 (10:45 -0800)]
Separate button references now that options are centered.

Bug: 12976464
Change-Id: I8f492f4a6f243cb986cd1fee7b0f284c3020e8d4

10 years agoam c4284574: Merge "new intent bottom bar ux" into gb-ub-photos-denali
Spike Sprague [Wed, 12 Feb 2014 18:35:40 +0000 (10:35 -0800)]
am c4284574: Merge "new intent bottom bar ux" into gb-ub-photos-denali

* commit 'c428457470c382ec8ccb1a2a41421e814a129431':
  new intent bottom bar ux

10 years agoMerge "new intent bottom bar ux" into gb-ub-photos-denali
Spike Sprague [Wed, 12 Feb 2014 18:33:26 +0000 (18:33 +0000)]
Merge "new intent bottom bar ux" into gb-ub-photos-denali

10 years agoam ac53715b: Invalidate background drawable of filmstrip layout
Angus Kong [Wed, 12 Feb 2014 02:27:48 +0000 (18:27 -0800)]
am ac53715b: Invalidate background drawable of filmstrip layout

* commit 'ac53715b1ca6704eff7e1142d2d3896cc91b8424':
  Invalidate background drawable of filmstrip layout

10 years agoInvalidate background drawable of filmstrip layout
Angus Kong [Wed, 12 Feb 2014 02:01:50 +0000 (18:01 -0800)]
Invalidate background drawable of filmstrip layout

bug:12974357
Change-Id: I4e0aaf470268e92274ee48d3045128876181577f

10 years agonew intent bottom bar ux
Spike Sprague [Wed, 12 Feb 2014 00:46:29 +0000 (16:46 -0800)]
new intent bottom bar ux

bug: 12969738
Change-Id: I938a7266a71ed6a6eb4cf3e8a0153d938df11e1f

10 years agoam a45d9f7f: Merge "Add settings entry point into mode switcher" into gb-ub-photos...
Doris Liu [Wed, 12 Feb 2014 01:24:20 +0000 (17:24 -0800)]
am a45d9f7f: Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali

* commit 'a45d9f7f11e1e6917af811faf4c51008cf1969c1':
  Add settings entry point into mode switcher

10 years agoMerge "Add settings entry point into mode switcher" into gb-ub-photos-denali
Doris Liu [Wed, 12 Feb 2014 01:22:56 +0000 (01:22 +0000)]
Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali

10 years agoAdd settings entry point into mode switcher
Doris Liu [Tue, 11 Feb 2014 18:41:40 +0000 (10:41 -0800)]
Add settings entry point into mode switcher

Bug: 12963148
Bug: 12964884
Change-Id: I11b45037abe1716d89fe723170284c61fbb33a87

10 years agoam 3cd3d046: Merge "Use ImageView as background for filmstrip layout." into gb-ub...
Angus Kong [Wed, 12 Feb 2014 00:30:03 +0000 (16:30 -0800)]
am 3cd3d046: Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali

* commit '3cd3d0460c87754c1f76da396cde609bcae27ee9':
  Use ImageView as background for filmstrip layout.

10 years agoMerge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali
Angus Kong [Wed, 12 Feb 2014 00:27:43 +0000 (00:27 +0000)]
Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali

10 years agoUse ImageView as background for filmstrip layout.
Angus Kong [Tue, 11 Feb 2014 23:26:01 +0000 (15:26 -0800)]
Use ImageView as background for filmstrip layout.

This is a workaround.

bug:12974357

Change-Id: I7e3601acddb623499776d689575bafb8f8a181d6

10 years agoam 99d4ff96: Merge "Update focus ring indicator with new assets." into gb-ub-photos...
Doris Liu [Tue, 11 Feb 2014 23:40:37 +0000 (15:40 -0800)]
am 99d4ff96: Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali

* commit '99d4ff969ff015b22a2ec19b02b14694f7049198':
  Update focus ring indicator with new assets.

10 years agoMerge "Update focus ring indicator with new assets." into gb-ub-photos-denali
Doris Liu [Tue, 11 Feb 2014 23:38:27 +0000 (23:38 +0000)]
Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali

10 years agoUpdate focus ring indicator with new assets.
Doris Liu [Tue, 11 Feb 2014 23:07:00 +0000 (15:07 -0800)]
Update focus ring indicator with new assets.

Bug: 12963258
Change-Id: I8f399aec05c2064b0b6dac0fc2e6fc31b68ca3ad

10 years agoam 713c3cad: Merge "fixing video mode stop button (too big? not anymore)" into gb...
Spike Sprague [Tue, 11 Feb 2014 22:24:55 +0000 (14:24 -0800)]
am 713c3cad: Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali

* commit '713c3cad6358aa9bc961cded929fa2b20f682bc0':
  fixing video mode stop button (too big? not anymore)