OSDN Git Service
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
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
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
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
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
Baligh Uddin [Thu, 13 Feb 2014 06:35:21 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 13 Feb 2014 06:35:03 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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
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
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
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.
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
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.
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
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
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
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
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
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
Seth Raphael [Thu, 6 Feb 2014 22:49:47 +0000 (14:49 -0800)]
Give Smart Camera a signal to start
Change-Id: I1b31d4cbf81a5865ef0807b07df0f644fa871247
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
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
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
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
Spike Sprague [Wed, 12 Feb 2014 18:33:26 +0000 (18:33 +0000)]
Merge "new intent bottom bar ux" into gb-ub-photos-denali
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
Angus Kong [Wed, 12 Feb 2014 02:01:50 +0000 (18:01 -0800)]
Invalidate background drawable of filmstrip layout
bug:
12974357
Change-Id: I4e0aaf470268e92274ee48d3045128876181577f
Spike Sprague [Wed, 12 Feb 2014 00:46:29 +0000 (16:46 -0800)]
new intent bottom bar ux
bug:
12969738
Change-Id: I938a7266a71ed6a6eb4cf3e8a0153d938df11e1f
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
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
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
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.
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
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
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.
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
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
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)
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
Baligh Uddin [Tue, 11 Feb 2014 21:28:42 +0000 (13:28 -0800)]
am
94599ebb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
94599ebb6f581372442013e542556e4573a5fa6c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Feb 2014 21:25:51 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Tue, 11 Feb 2014 21:25:46 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Doris Liu [Tue, 11 Feb 2014 20:32:02 +0000 (12:32 -0800)]
am
af6c1ef8: Merge "Move photosphere icon assets to protected res dir" into gb-ub-photos-denali
* commit '
af6c1ef8b0ff460c9f8a9945e44a3102329401c0':
Move photosphere icon assets to protected res dir
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
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
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
Erin Dahlgren [Tue, 11 Feb 2014 18:08:48 +0000 (10:08 -0800)]
am
04f4e6df: Add 6dp margins around mode options.
* commit '
04f4e6dfe3345f53b526a4a3f10ae549885afea1':
Add 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
Spike Sprague [Tue, 11 Feb 2014 06:13:32 +0000 (22:13 -0800)]
am
372c609a: Merge "min / max bottom bar height logic" into gb-ub-photos-denali
* commit '
372c609a2cd0c5aa2e42bcc68df3440d70daa114':
min / max bottom bar height logic
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
Spike Sprague [Mon, 6 Jan 2014 19:18:40 +0000 (11:18 -0800)]
min / max bottom bar height logic
bug:
12668831
Change-Id: Iadccd4c150a37955b0c612539edb6b747f87acbb
Doris Liu [Tue, 11 Feb 2014 02:17:24 +0000 (18:17 -0800)]
am
dfe96eac: New focus indicator for touch to focus
* commit '
dfe96eac810876659f831d2c9054f33b698916e7':
New 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
Sascha Haeberling [Tue, 11 Feb 2014 00:48:30 +0000 (16:48 -0800)]
am
1b1583ee: Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
* commit '
1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1':
New Settings UI and video quality selection logic.
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
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
Doris Liu [Tue, 11 Feb 2014 00:44:23 +0000 (16:44 -0800)]
am
9395bade: Merge "Mode switcher refinements." into gb-ub-photos-denali
* commit '
9395bade85aab015f4d2914d6b27b8b6c625ba63':
Mode switcher refinements.
Doris Liu [Tue, 11 Feb 2014 00:39:31 +0000 (00:39 +0000)]
Merge "Mode switcher refinements." into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 23:51:39 +0000 (15:51 -0800)]
am
7fc3f71e: Merge "Change capture animation to simple flash" into gb-ub-photos-denali
* commit '
7fc3f71edde748f869ea40aa60932102553abf80':
Change capture animation to simple flash
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
Angus Kong [Mon, 10 Feb 2014 22:54:29 +0000 (14:54 -0800)]
Change capture animation to simple flash
bug:
12959370
Change-Id: I7ea7c9da2642a348d1cb6b802fe64048720ebee8
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
Baligh Uddin [Mon, 10 Feb 2014 23:28:02 +0000 (15:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I65741f8a902ec45c073d1308e390f49893ec73c1
Auto-generated-cl: translation import
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
Spike Sprague [Mon, 10 Feb 2014 22:33:15 +0000 (14:33 -0800)]
am
4108d9ac: Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
* commit '
4108d9ace2a0f40ad28f8d6530a174f1a0cffe95':
fixing intent ui controls visibility
Spike Sprague [Mon, 10 Feb 2014 22:31:00 +0000 (22:31 +0000)]
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 20:11:20 +0000 (12:11 -0800)]
fixing intent ui controls visibility
bug:
12668877
Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f
Erin Dahlgren [Mon, 10 Feb 2014 22:09:47 +0000 (14:09 -0800)]
am
a706c94d: Separate capture icons into a protected res dir.
* commit '
a706c94d2c96f47927cc3026fcf9d1c42c01489b':
Separate 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
Angus Kong [Mon, 10 Feb 2014 20:17:31 +0000 (12:17 -0800)]
am
8b25ded2: Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali
* commit '
8b25ded274ecc9377950ea22ff70c351d8914d9b':
De-overlap of undo bar and filmstrip controls.
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
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
Spike Sprague [Mon, 10 Feb 2014 19:11:36 +0000 (11:11 -0800)]
am
32ca1e52: Merge "video stop button diameter increased" into gb-ub-photos-denali
* commit '
32ca1e5290b0f9acde6b106f31e0917c770c19be':
video stop button diameter increased
Spike Sprague [Mon, 10 Feb 2014 19:10:19 +0000 (19:10 +0000)]
Merge "video stop button diameter increased" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 18:54:54 +0000 (10:54 -0800)]
video stop button diameter increased
bug:
12954412
Change-Id: I7b2cd286fbd0871fdaec185090c304edcb582c1e
Doris Liu [Sat, 8 Feb 2014 02:35:59 +0000 (18:35 -0800)]
am
213a4a08: New mode drawer.
* commit '
213a4a086b54904cee543adf60b16fc1a61efe38':
New 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
Erin Dahlgren [Sat, 8 Feb 2014 01:38:34 +0000 (17:38 -0800)]
am
e69b8889: Merge "Ensure that mode options and indicators are fixed size." into gb-ub-photos-denali
* commit '
e69b88893922350461c3a30586aa9194783ff612':
Ensure that mode options and indicators are fixed size.
Erin Dahlgren [Sat, 8 Feb 2014 01:38:33 +0000 (17:38 -0800)]
am
62a78dec: Merge "Add grid lines option and indicator." into gb-ub-photos-denali
* commit '
62a78decdecd84b516854f2ccbf629d76cdf09eb':
Add grid lines option and indicator.
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
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
Spike Sprague [Sat, 8 Feb 2014 01:35:22 +0000 (17:35 -0800)]
am
5ea38e3e: Merge "size bottom bar width to match preview area" into gb-ub-photos-denali
* commit '
5ea38e3e1d1983a5734b8b84c5eff705e47ce821':
size bottom bar width to match preview area
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
Erin Dahlgren [Fri, 7 Feb 2014 20:38:57 +0000 (12:38 -0800)]
Add grid lines option and indicator.
Bug:
12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
Erin Dahlgren [Sat, 8 Feb 2014 01:17:08 +0000 (17:17 -0800)]
am
d8de077f: Shared texture view in photosphere.
* commit '
d8de077f72b04cee1bdf26e5ca1678ac5297bd71':
Shared 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
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
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
Angus Kong [Fri, 7 Feb 2014 22:04:48 +0000 (14:04 -0800)]
am
fe60979d: Move onPreviewAreaSizeChanged() out of layout pass
* commit '
fe60979d7d7ce78de503404da8e91e118242071a':
Move 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
Andy Huibers [Fri, 7 Feb 2014 19:16:52 +0000 (11:16 -0800)]
am
771040cd: Scale high aspect ratio Bitmaps to use full texture size.
* commit '
771040cd327bdf819af789321207a72a359a3a37':
Scale 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
Erin Dahlgren [Wed, 5 Feb 2014 23:02:27 +0000 (15:02 -0800)]
am
66f41b34: Fix an IllegalStateException introduced by ag/413832.
* commit '
66f41b3440ed95fdb079dab7993f839fcbb3641b':
Fix 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
Erin Dahlgren [Wed, 5 Feb 2014 22:47:21 +0000 (14:47 -0800)]
am
d1df1984: Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali
* commit '
d1df1984b7742a9f555d366e3acb87c3a43af5b4':
Treat mode toggle as indicators or default toggle view.
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
Geoff Mendal [Wed, 5 Feb 2014 22:44:15 +0000 (14:44 -0800)]
am
e450d931: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali
* commit '
e450d9311b2b5a9157cebdf73850f9a760a3c76d':
Revert "Revert "Import translations. DO NOT MERGE""
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
Geoff Mendal [Wed, 5 Feb 2014 22:42:44 +0000 (22:42 +0000)]
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into ub-camera-everglades
Geoff Mendal [Wed, 5 Feb 2014 22:42:38 +0000 (22:42 +0000)]
Revert "Revert "Import translations. DO NOT MERGE""
This reverts commit
22389deaded9152040140a4b4dfb9aa635264a9b.
Change-Id: I8be68e5fb89a28f5a4237540fad8656d6156e963
OSDN Git Service
