OSDN Git Service

android-x86/packages-apps-Camera2.git
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 "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 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 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 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 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 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 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 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 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 agoMerge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali
Spike Sprague [Tue, 11 Feb 2014 22:22:06 +0000 (22:22 +0000)]
Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Tue, 11 Feb 2014 21:25:46 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years agoMerge "Move photosphere icon assets to protected res dir" into gb-ub-photos-denali
Doris Liu [Tue, 11 Feb 2014 20:30:34 +0000 (20:30 +0000)]
Merge "Move photosphere icon assets to protected res dir" into gb-ub-photos-denali

10 years agofixing video mode stop button (too big? not anymore)
Spike Sprague [Tue, 11 Feb 2014 20:27:23 +0000 (12:27 -0800)]
fixing video mode stop button (too big? not anymore)

bug: 12970650
Change-Id: Idf22205919b295c0ca51beed93a187da11a327ed

10 years agoMove photosphere icon assets to protected res dir
Doris Liu [Tue, 11 Feb 2014 18:55:10 +0000 (10:55 -0800)]
Move photosphere icon assets to protected res dir

Bug: 12963334
Change-Id: I6b55564971e0db0fab7eed53ca033b4602acb8ed

10 years agoAdd 6dp margins around mode options.
Erin Dahlgren [Tue, 11 Feb 2014 17:59:59 +0000 (09:59 -0800)]
Add 6dp margins around mode options.

Bug: 12954602
Change-Id: I3652fc62987a46626e198d5da694d7972be68547

10 years agoMerge "min / max bottom bar height logic" into gb-ub-photos-denali
Spike Sprague [Tue, 11 Feb 2014 06:11:16 +0000 (06:11 +0000)]
Merge "min / max bottom bar height logic" into gb-ub-photos-denali

10 years agomin / max bottom bar height logic
Spike Sprague [Mon, 6 Jan 2014 19:18:40 +0000 (11:18 -0800)]
min / max bottom bar height logic

bug: 12668831

Change-Id: Iadccd4c150a37955b0c612539edb6b747f87acbb

10 years agoNew focus indicator for touch to focus
Doris Liu [Tue, 11 Feb 2014 01:14:06 +0000 (17:14 -0800)]
New focus indicator for touch to focus

Bug: 12954917
Change-Id: I103c1071c81c48bbbd3a90cce2e2a39df4bd633e

10 years agoMerge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
Sascha Haeberling [Tue, 11 Feb 2014 00:46:37 +0000 (00:46 +0000)]
Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali

10 years agoNew Settings UI and video quality selection logic.
Sascha Haeberling [Fri, 7 Feb 2014 01:30:53 +0000 (02:30 +0100)]
New Settings UI and video quality selection logic.

  Bug: 12467965
  Bug: 12935910
  Bug: 12575084

Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.

Change-Id: I412af424b74369cef15c7ead2cb09704875972e3

10 years agoMerge "Mode switcher refinements." into gb-ub-photos-denali
Doris Liu [Tue, 11 Feb 2014 00:39:31 +0000 (00:39 +0000)]
Merge "Mode switcher refinements." into gb-ub-photos-denali

10 years agoMerge "Change capture animation to simple flash" into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 23:49:50 +0000 (23:49 +0000)]
Merge "Change capture animation to simple flash" into gb-ub-photos-denali

10 years agoChange capture animation to simple flash
Angus Kong [Mon, 10 Feb 2014 22:54:29 +0000 (14:54 -0800)]
Change capture animation to simple flash

bug:12959370
Change-Id: I7ea7c9da2642a348d1cb6b802fe64048720ebee8

10 years agoMode switcher refinements.
Doris Liu [Mon, 10 Feb 2014 22:42:08 +0000 (14:42 -0800)]
Mode switcher refinements.

- Increase the mode switch icon size.
- Change mode cover color to 0x191919
- Change the font of mode text to roboto medium
- Change the highlight state of mode icon to fill

Bug: 12954273
Bug: 12954790
Bug: 12954370
Bug: 12953261
Change-Id: I23ef62ae4ce5589da20c7ee6bf805e5af70b62f2

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 10 Feb 2014 23:26:42 +0000 (15:26 -0800)]
Import translations. DO NOT MERGE

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

10 years agoMerge "fixing intent ui controls visibility" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 22:31:00 +0000 (22:31 +0000)]
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali

10 years agofixing intent ui controls visibility
Spike Sprague [Mon, 10 Feb 2014 20:11:20 +0000 (12:11 -0800)]
fixing intent ui controls visibility

bug: 12668877
Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f

10 years agoSeparate capture icons into a protected res dir.
Erin Dahlgren [Mon, 10 Feb 2014 20:38:37 +0000 (12:38 -0800)]
Separate capture icons into a protected res dir.

Bug:  12954169
Change-Id: I0ecd4c69fb15308e463047cac16213cbfe125973

10 years agoMerge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 20:14:59 +0000 (20:14 +0000)]
Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali

10 years agoDe-overlap of undo bar and filmstrip controls.
Angus Kong [Mon, 10 Feb 2014 19:37:29 +0000 (11:37 -0800)]
De-overlap of undo bar and filmstrip controls.

bug:12958725

Change-Id: Iaaf31ae02e9f1975b8c3ec20fea2b6da36208278

10 years agoMerge "video stop button diameter increased" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 19:10:19 +0000 (19:10 +0000)]
Merge "video stop button diameter increased" into gb-ub-photos-denali

10 years agovideo stop button diameter increased
Spike Sprague [Mon, 10 Feb 2014 18:54:54 +0000 (10:54 -0800)]
video stop button diameter increased

bug: 12954412
Change-Id: I7b2cd286fbd0871fdaec185090c304edcb582c1e

10 years agoNew mode drawer.
Doris Liu [Wed, 5 Feb 2014 00:57:55 +0000 (16:57 -0800)]
New mode drawer.

-Changed the entire look of the mode drawer by using a live preview
 as background, and use circle icons rather than block shaped icons
-Fade in the blurred preview frame during mode switch
-Add highlighted and selected states to mode icons
-Center the mode drawer in preview rather than whole screen
-Swapped mode order in the drawer

TODO:
-Add settings access point
-Refine swipe in/out behavior of the drawer

Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f

10 years agoMerge "Ensure that mode options and indicators are fixed size." into gb-ub-photos...
Erin Dahlgren [Sat, 8 Feb 2014 01:37:21 +0000 (01:37 +0000)]
Merge "Ensure that mode options and indicators are fixed size." into gb-ub-photos-denali

10 years agoMerge "Add grid lines option and indicator." into gb-ub-photos-denali
Erin Dahlgren [Sat, 8 Feb 2014 01:36:35 +0000 (01:36 +0000)]
Merge "Add grid lines option and indicator." into gb-ub-photos-denali

10 years agoMerge "size bottom bar width to match preview area" into gb-ub-photos-denali
Spike Sprague [Sat, 8 Feb 2014 01:33:59 +0000 (01:33 +0000)]
Merge "size bottom bar width to match preview area" into gb-ub-photos-denali

10 years agoAdd grid lines option and indicator.
Erin Dahlgren [Fri, 7 Feb 2014 20:38:57 +0000 (12:38 -0800)]
Add grid lines option and indicator.

Bug: 12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e

10 years agoShared texture view in photosphere.
Erin Dahlgren [Mon, 3 Feb 2014 18:12:27 +0000 (10:12 -0800)]
Shared texture view in photosphere.

Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f

10 years agosize bottom bar width to match preview area
Spike Sprague [Sat, 8 Feb 2014 00:01:48 +0000 (16:01 -0800)]
size bottom bar width to match preview area

bug: 12563756
Change-Id: If6d26aa050ab130a177a6c2c21e38ee11cb985b5

10 years agoEnsure that mode options and indicators are fixed size.
Erin Dahlgren [Fri, 7 Feb 2014 22:11:36 +0000 (14:11 -0800)]
Ensure that mode options and indicators are fixed size.

Change-Id: I487cefaaffe8d2adb2f078692a7a0af16e48dfa3

10 years agoMove onPreviewAreaSizeChanged() out of layout pass
Angus Kong [Fri, 7 Feb 2014 19:20:00 +0000 (11:20 -0800)]
Move onPreviewAreaSizeChanged() out of layout pass

Change-Id: I4eb6f6ffda1438fca7575328ce09945d40549d51

10 years agoScale high aspect ratio Bitmaps to use full texture size.
Andy Huibers [Fri, 7 Feb 2014 18:10:16 +0000 (10:10 -0800)]
Scale high aspect ratio Bitmaps to use full texture size.

Bug:11137777

Change-Id: I1a7ae213d3cdc199d381b89b610c5a195e30fbe9

10 years agoFix an IllegalStateException introduced by ag/413832.
Erin Dahlgren [Wed, 5 Feb 2014 22:53:06 +0000 (14:53 -0800)]
Fix an IllegalStateException introduced by ag/413832.

Change-Id: Ib160c313af4e60215a9a91b93a2ec2506a06c5d2

10 years agoMerge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos...
Erin Dahlgren [Wed, 5 Feb 2014 22:44:25 +0000 (22:44 +0000)]
Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali

10 years agoTreat mode toggle as indicators or default toggle view.
Erin Dahlgren [Mon, 3 Feb 2014 23:55:31 +0000 (15:55 -0800)]
Treat mode toggle as indicators or default toggle view.

Change-Id: I25a97cea27893ab76a8930c99de8e65eb2904b36

10 years agoMerge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 22:42:13 +0000 (22:42 +0000)]
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali

10 years agoRevert "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Wed, 5 Feb 2014 22:42:08 +0000 (22:42 +0000)]
Revert "Revert "Import translations. DO NOT MERGE""

This reverts commit f8919f0be4f94288edac60f9ab65768f335ab847.

Change-Id: Ibbb702ec82939254d88aba30e58ffc12b0411bbc

10 years agoMerge "Revert "Import translations. DO NOT MERGE"" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 22:26:40 +0000 (22:26 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into gb-ub-photos-denali

10 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 22:26:34 +0000 (22:26 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit c31dc66e88992d92decf8c2121cb99c481fec3f0.

Change-Id: I0f938daddcb866947a5015b91cbd8cb650e0bf18

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 22:05:50 +0000 (22:05 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Feb 2014 21:53:40 +0000 (13:53 -0800)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Prevent crash if first-time location dialog." into gb-ub-photos-denali
Sascha Haeberling [Wed, 5 Feb 2014 21:36:56 +0000 (21:36 +0000)]
Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali

10 years agoPrevent crash if first-time location dialog.
Sascha Haeberling [Wed, 5 Feb 2014 21:06:27 +0000 (22:06 +0100)]
Prevent crash if first-time location dialog.

Change-Id: I34f44220202f7b7b39facf7caf9cd46e6e44acc4

10 years agoMerge "Properly guard the weak reference." into gb-ub-photos-denali
Sascha Haeberling [Wed, 5 Feb 2014 21:03:22 +0000 (21:03 +0000)]
Merge "Properly guard the weak reference." into gb-ub-photos-denali

10 years agoProperly guard the weak reference.
Sascha Haeberling [Wed, 5 Feb 2014 20:48:55 +0000 (21:48 +0100)]
Properly guard the weak reference.

  Bug: 12805279

Change-Id: I268b121807d10edaba5d627eb3fc2d2ffc6579d3

10 years agoUpdate new Camera2 indicator assets.
Erin Dahlgren [Wed, 5 Feb 2014 19:05:21 +0000 (11:05 -0800)]
Update new Camera2 indicator assets.

Bug: 12893552
Change-Id: I9d8133291626563d0e044f9735592b591671332c

10 years agoElevate refocus to its own mode, merge craft and camera.
Erin Dahlgren [Mon, 3 Feb 2014 21:24:55 +0000 (13:24 -0800)]
Elevate refocus to its own mode, merge craft and camera.

Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05

10 years agoAvoid activity leaks.
Sascha Haeberling [Tue, 4 Feb 2014 11:48:55 +0000 (12:48 +0100)]
Avoid activity leaks.

  Bug: 12805279

Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759