OSDN Git Service
ztenghui [Tue, 12 Nov 2013 04:50:48 +0000 (20:50 -0800)]
am
3a1ab872: am
65d1169f: am
d12bbb8a: am
6a42c3ae: Add a null check to fix NPE
* commit '
3a1ab872bd051bedab63aa75acbcce6bd34597f9':
Add a null check to fix NPE
Ed Heyl [Tue, 12 Nov 2013 04:50:47 +0000 (20:50 -0800)]
am
33c2b60b: am
1c9a6a14: am
2b5aa3e3: merge in release branch changes (no-op).
* commit '
33c2b60b9561487af3ecf4f5e52c1d345fd7f265':
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
Show chooser on EDIT intents that have no activity for action.
Parallelize opening the camera with view handling in photo mode.
Decouple the visibility check for system UI from action bar
Don't crash Photo Sphere on back button press in filmstrip.
Check for media service being present before capture.
Seth Raphael [Tue, 12 Nov 2013 04:50:46 +0000 (20:50 -0800)]
am
203511fd: am
2aa0d2b3: am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
203511fd372df4e7f9c1a2e3b2822b60981e653f':
Add logging to various actions
Ruben Brunk [Tue, 12 Nov 2013 04:50:46 +0000 (20:50 -0800)]
am
eaaca513: am
6911bfca: am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
eaaca5130356a9bb2e38d590b63072ed507f5f9d':
Ensure mOpenCameraThread has been setup before dereferencing.
Sascha Haeberling [Tue, 12 Nov 2013 04:50:45 +0000 (20:50 -0800)]
am
176b0992: am
aa158f2f: am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
176b099253e3a0eeec3ad2665157c126629b2ae2':
Add GCam progress indicator.
Andy Huibers [Tue, 12 Nov 2013 04:50:44 +0000 (20:50 -0800)]
am
02cdd0a4: am
8bc966eb: am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
02cdd0a4fc53f91ba11e191527b90720e10f8929':
hide preview cover on arrival of new preview data if hidden
Erin Dahlgren [Tue, 12 Nov 2013 04:50:43 +0000 (20:50 -0800)]
am
40b6b458: am
30ac3520: am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
40b6b4585c7ac59667b32e3e0f275423c665c8b8':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Tue, 12 Nov 2013 04:50:43 +0000 (20:50 -0800)]
am
71e8e91d: am
570d8da0: am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Tue, 12 Nov 2013 04:50:42 +0000 (20:50 -0800)]
am
1ffe5c18: am
d2aeec25: am
c8761589: am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
1ffe5c18a3f219496a0d85f50aeb31f4e8643758':
Parallelize opening the camera with view handling in photo mode.
ztenghui [Tue, 12 Nov 2013 04:50:42 +0000 (20:50 -0800)]
am
e77b0b74: am
2c14fb02: am
d2b57761: am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
e77b0b74c1fb085ed247697226a5d8642932e83d':
Decouple the visibility check for system UI from action bar
Baligh Uddin [Tue, 12 Nov 2013 04:50:41 +0000 (20:50 -0800)]
am
c54d55f6: (-s ours) am
fef07e22: (-s ours) am
f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c54d55f60cf80e82353a407fe61fb9b13238fb24':
Import translations. DO NOT MERGE
Sascha Haeberling [Tue, 12 Nov 2013 04:50:40 +0000 (20:50 -0800)]
am
35965b92: am
ef339df9: am
107e93ee: am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
35965b92472f0751e3c1a3b9737b4daff05c3efd':
Don't crash Photo Sphere on back button press in filmstrip.
Baligh Uddin [Mon, 11 Nov 2013 19:04:58 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5473adda29e7188a6e12ee57a1576f6ca6abadda
Auto-generated-cl: translation import
ztenghui [Mon, 11 Nov 2013 17:11:46 +0000 (09:11 -0800)]
am
65d1169f: am
d12bbb8a: am
6a42c3ae: Add a null check to fix NPE
* commit '
65d1169f8f100139cfbd6050094489230377cff1':
Add a null check to fix NPE
Ed Heyl [Mon, 11 Nov 2013 17:11:22 +0000 (09:11 -0800)]
am
1c9a6a14: am
2b5aa3e3: merge in release branch changes (no-op).
* commit '
1c9a6a1431c0eec8f7f08cc81429aa5e20322bfc':
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
Show chooser on EDIT intents that have no activity for action.
Parallelize opening the camera with view handling in photo mode.
Decouple the visibility check for system UI from action bar
Don't crash Photo Sphere on back button press in filmstrip.
Check for media service being present before capture.
Seth Raphael [Mon, 11 Nov 2013 17:11:21 +0000 (09:11 -0800)]
am
2aa0d2b3: am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
2aa0d2b3ab80194be3c5b9aaab2face534a363c8':
Add logging to various actions
Ruben Brunk [Mon, 11 Nov 2013 17:11:21 +0000 (09:11 -0800)]
am
6911bfca: am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
6911bfca1b8be8b1bd41f30dee77828678de3bd7':
Ensure mOpenCameraThread has been setup before dereferencing.
Sascha Haeberling [Mon, 11 Nov 2013 17:11:20 +0000 (09:11 -0800)]
am
aa158f2f: am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
aa158f2fc14b8df1f0f1d36429f094153cf9b376':
Add GCam progress indicator.
Andy Huibers [Mon, 11 Nov 2013 17:11:20 +0000 (09:11 -0800)]
am
8bc966eb: am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
8bc966eb1879d8b9d6c8552c160762c5595bbd13':
hide preview cover on arrival of new preview data if hidden
Erin Dahlgren [Mon, 11 Nov 2013 17:11:19 +0000 (09:11 -0800)]
am
30ac3520: am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
30ac35202ada27aef3bbeeae03f73c49249569ee':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Mon, 11 Nov 2013 17:11:19 +0000 (09:11 -0800)]
am
570d8da0: am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
570d8da0ee90cadca3b2281ad0d37078702f614f':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Mon, 11 Nov 2013 17:11:18 +0000 (09:11 -0800)]
am
d2aeec25: am
c8761589: am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
d2aeec255f7db1fbe8e2e2441031c91706630625':
Parallelize opening the camera with view handling in photo mode.
ztenghui [Mon, 11 Nov 2013 17:11:18 +0000 (09:11 -0800)]
am
2c14fb02: am
d2b57761: am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
2c14fb02cc38f39480d39ec0a32f126483d64527':
Decouple the visibility check for system UI from action bar
Baligh Uddin [Mon, 11 Nov 2013 17:11:18 +0000 (09:11 -0800)]
am
fef07e22: (-s ours) am
f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fef07e226b01e4720e0a1f99f41520e29c10c7f7':
Import translations. DO NOT MERGE
Sascha Haeberling [Mon, 11 Nov 2013 17:11:17 +0000 (09:11 -0800)]
am
ef339df9: am
107e93ee: am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
ef339df93d7013a8e03c57c586d2206c0855c5f2':
Don't crash Photo Sphere on back button press in filmstrip.
ztenghui [Mon, 11 Nov 2013 17:00:01 +0000 (09:00 -0800)]
am
d12bbb8a: am
6a42c3ae: Add a null check to fix NPE
* commit '
d12bbb8a7ba13fb9e743b62fc9d9779517b8d43e':
Add a null check to fix NPE
ztenghui [Mon, 11 Nov 2013 16:56:45 +0000 (08:56 -0800)]
am
6a42c3ae: Add a null check to fix NPE
* commit '
6a42c3ae157c4495db56541ef87f6ee56b5d10b3':
Add a null check to fix NPE
ztenghui [Sat, 9 Nov 2013 01:17:52 +0000 (17:17 -0800)]
Add a null check to fix NPE
bug:
11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
Ed Heyl [Fri, 8 Nov 2013 21:31:34 +0000 (13:31 -0800)]
am
2b5aa3e3: merge in release branch changes (no-op).
* commit '
2b5aa3e38b55f28ea1c5f619b921a7470cc926a0':
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
Show chooser on EDIT intents that have no activity for action.
Parallelize opening the camera with view handling in photo mode.
Decouple the visibility check for system UI from action bar
Don't crash Photo Sphere on back button press in filmstrip.
Check for media service being present before capture.
Ed Heyl [Fri, 8 Nov 2013 21:23:51 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
ztenghui [Fri, 8 Nov 2013 17:34:04 +0000 (09:34 -0800)]
am
57933be4: am
f82f66c1: am
970cd50b: am
189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad
* commit '
57933be4248be055cdc0a273fe1a92fe94fb7bdf':
Fix the RTL layout in the app's manifest.
Erin Dahlgren [Fri, 8 Nov 2013 17:34:03 +0000 (09:34 -0800)]
am
718da285: am
dffe3cb6: am
f41109d8: am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
718da2850e443f6df9ebc1fef19344dcfe7cb412':
Make image editor intent general.
Alan Newberger [Fri, 8 Nov 2013 17:34:02 +0000 (09:34 -0800)]
am
d6384381: am
4fc8f6bd: am
6fddfed2: am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
d6384381abf59003702e20371fca2ba607eea33f':
add 'capturing' string for in process indicators
ztenghui [Fri, 8 Nov 2013 17:31:35 +0000 (09:31 -0800)]
am
f82f66c1: am
970cd50b: am
189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad
* commit '
f82f66c1fcc8f9f21f00fdf8e83f58c3e1869519':
Fix the RTL layout in the app's manifest.
Erin Dahlgren [Fri, 8 Nov 2013 17:31:35 +0000 (09:31 -0800)]
am
dffe3cb6: am
f41109d8: am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
dffe3cb681048e2a29c9da331dc0180a730232f8':
Make image editor intent general.
Alan Newberger [Fri, 8 Nov 2013 17:31:34 +0000 (09:31 -0800)]
am
4fc8f6bd: am
6fddfed2: am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
4fc8f6bd5877189a9e65859a6b742e4b496e3d7a':
add 'capturing' string for in process indicators
Seth Raphael [Fri, 8 Nov 2013 03:56:17 +0000 (19:56 -0800)]
am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
05f23b7d90bbe6161da8759f707a5d271a9d9f70':
Add logging to various actions
Seth Raphael [Fri, 8 Nov 2013 03:54:16 +0000 (19:54 -0800)]
am
cbd8267e: Add logging to various actions
* commit '
cbd8267ee99e457f72822e8d8187b5e6823104f8':
Add logging to various actions
Seth Raphael [Tue, 5 Nov 2013 18:12:36 +0000 (10:12 -0800)]
Add logging to various actions
Bug:
11514148
Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
Ruben Brunk [Fri, 8 Nov 2013 02:36:44 +0000 (18:36 -0800)]
am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
56960b7ebee5c4c9493d35b336adb41afb34a2bd':
Ensure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:34:11 +0000 (18:34 -0800)]
am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
36d84c1d273faf24c6907e173cf95f233db71592':
Ensure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:31:54 +0000 (02:31 +0000)]
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
Ruben Brunk [Fri, 8 Nov 2013 02:12:41 +0000 (18:12 -0800)]
Ensure mOpenCameraThread has been setup before dereferencing.
Bug:
11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.
Bug:
11505806
Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden
Bug:
11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
Erin Dahlgren [Thu, 7 Nov 2013 19:55:49 +0000 (11:55 -0800)]
Fix photo mode is getting stuck in a single CameraState.
Bug:
11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
Erin Dahlgren [Thu, 7 Nov 2013 19:35:10 +0000 (11:35 -0800)]
Show chooser on EDIT intents that have no activity for action.
Bug:
11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
Erin Dahlgren [Wed, 6 Nov 2013 19:57:51 +0000 (11:57 -0800)]
Parallelize opening the camera with view handling in photo mode.
Bug:
11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
ztenghui [Wed, 6 Nov 2013 22:20:31 +0000 (14:20 -0800)]
Decouple the visibility check for system UI from action bar
And make sure we toggle system UI when reload.
bug:
11539377
Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
Sascha Haeberling [Thu, 7 Nov 2013 23:30:51 +0000 (15:30 -0800)]
am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
0351d05de1e9fe9abd97f082f9de940066b0c818':
Add GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 23:29:03 +0000 (15:29 -0800)]
am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
2b78c0c048fe906beaeadeee3e267524c808c340':
Add GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.
Bug:
11505806
Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
Andy Huibers [Thu, 7 Nov 2013 22:47:55 +0000 (14:47 -0800)]
am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
c504af14a839ee44e84cc7af84b348a80cde97ff':
hide preview cover on arrival of new preview data if hidden
Andy Huibers [Thu, 7 Nov 2013 22:44:36 +0000 (14:44 -0800)]
am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
fccf83bd342a3a83dc284525488e69f25e4667c4':
hide preview cover on arrival of new preview data if hidden
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden
Bug:
11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
Erin Dahlgren [Thu, 7 Nov 2013 21:34:02 +0000 (13:34 -0800)]
am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
cbe9fc1fea10a8c98cff2fd5418d50fc765a6235':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Thu, 7 Nov 2013 21:29:43 +0000 (13:29 -0800)]
am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
2f878d54ecbb62ef09aa2b0152dea983e598724f':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Thu, 7 Nov 2013 21:24:34 +0000 (21:24 +0000)]
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
Erin Dahlgren [Thu, 7 Nov 2013 21:07:38 +0000 (13:07 -0800)]
am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
5a0475e4d7fdc0a1ec3dae3eea3cf8ea2b882fbd':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 21:06:35 +0000 (13:06 -0800)]
am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
05a04924312fbcda2161da01e0749eb80c2663d1':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 19:55:49 +0000 (11:55 -0800)]
Fix photo mode is getting stuck in a single CameraState.
Bug:
11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
Erin Dahlgren [Thu, 7 Nov 2013 19:35:10 +0000 (11:35 -0800)]
Show chooser on EDIT intents that have no activity for action.
Bug:
11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
Erin Dahlgren [Thu, 7 Nov 2013 18:15:34 +0000 (10:15 -0800)]
am
c8761589: am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
c876158977a8555e2bc93395834596e8e10636e1':
Parallelize opening the camera with view handling in photo mode.
Erin Dahlgren [Thu, 7 Nov 2013 18:12:17 +0000 (10:12 -0800)]
am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
7e6e947f0e530c14b32785bdb3094ea473000a12':
Parallelize opening the camera with view handling in photo mode.
Erin Dahlgren [Thu, 7 Nov 2013 18:09:44 +0000 (18:09 +0000)]
Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 6 Nov 2013 19:57:51 +0000 (11:57 -0800)]
Parallelize opening the camera with view handling in photo mode.
Bug:
11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
ztenghui [Thu, 7 Nov 2013 17:58:28 +0000 (09:58 -0800)]
am
d2b57761: am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
d2b57761ec5e8b4c5e2d7ec8af48ce4914f1c6bb':
Decouple the visibility check for system UI from action bar
ztenghui [Thu, 7 Nov 2013 17:56:02 +0000 (09:56 -0800)]
am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
9070def99369ccdffb1cf5e006ed30646297f490':
Decouple the visibility check for system UI from action bar
ztenghui [Thu, 7 Nov 2013 17:53:54 +0000 (17:53 +0000)]
Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
The Android Automerger [Thu, 7 Nov 2013 14:01:12 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:07:08 +0000 (20:07 -0800)]
am
f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f5d6fc67f32015683840936727726c9f2306cb15':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:02:38 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Sascha Haeberling [Wed, 6 Nov 2013 22:03:17 +0000 (14:03 -0800)]
Don't crash Photo Sphere on back button press in filmstrip.
Bug:
11554580
Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
Baligh Uddin [Wed, 6 Nov 2013 23:02:50 +0000 (15:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d30a3739e39a85e03e51cb7d06ea1cd2a6a5504
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:02:03 +0000 (15:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89b964b8ab69359b791eac89bf99b8d518678e27
Auto-generated-cl: translation import
ztenghui [Wed, 6 Nov 2013 22:20:31 +0000 (14:20 -0800)]
Decouple the visibility check for system UI from action bar
And make sure we toggle system UI when reload.
bug:
11539377
Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
Sascha Haeberling [Wed, 6 Nov 2013 22:10:41 +0000 (14:10 -0800)]
am
107e93ee: am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
107e93eee2a3c48e20c17a8a55b4ff5f5c2ebd46':
Don't crash Photo Sphere on back button press in filmstrip.
Sascha Haeberling [Wed, 6 Nov 2013 22:08:20 +0000 (14:08 -0800)]
am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
eb605b4a27be212915db5bc23e9a82b857036a1c':
Don't crash Photo Sphere on back button press in filmstrip.
Sascha Haeberling [Wed, 6 Nov 2013 22:03:17 +0000 (14:03 -0800)]
Don't crash Photo Sphere on back button press in filmstrip.
Bug:
11554580
Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
ztenghui [Wed, 6 Nov 2013 18:36:11 +0000 (10:36 -0800)]
am
970cd50b: am
189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad
* commit '
970cd50b34a40121363615f1c33816340d84c1e3':
Fix the RTL layout in the app's manifest.
ztenghui [Wed, 6 Nov 2013 18:34:49 +0000 (10:34 -0800)]
am
189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad
* commit '
189bfea2c8fd3374aac99f4c18cda357fcf2a371':
Fix the RTL layout in the app's manifest.
ztenghui [Wed, 6 Nov 2013 18:32:33 +0000 (18:32 +0000)]
Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 6 Nov 2013 17:58:49 +0000 (09:58 -0800)]
am
f41109d8: am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
f41109d8d15e63399fb3331e577da218a3300d5d':
Make image editor intent general.
Erin Dahlgren [Wed, 6 Nov 2013 17:57:12 +0000 (09:57 -0800)]
am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
982542701ef5737456f5ee204684a36620db5475':
Make image editor intent general.
Erin Dahlgren [Wed, 6 Nov 2013 17:54:41 +0000 (17:54 +0000)]
Merge "Make image editor intent general." into gb-ub-photos-carlsbad
The Android Automerger [Wed, 6 Nov 2013 14:01:05 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Alan Newberger [Wed, 6 Nov 2013 04:49:49 +0000 (20:49 -0800)]
am
6fddfed2: am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
6fddfed299cc4b8227f534d3ca2679670e1737bb':
add 'capturing' string for in process indicators
Alan Newberger [Wed, 6 Nov 2013 04:47:39 +0000 (20:47 -0800)]
am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb':
add 'capturing' string for in process indicators
Alan Newberger [Wed, 6 Nov 2013 04:15:01 +0000 (20:15 -0800)]
add 'capturing' string for in process indicators
This string can be used for in progess screen indicators.
Bug:
11505806
Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
Ruben Brunk [Wed, 6 Nov 2013 03:18:01 +0000 (19:18 -0800)]
am
d37b3039: am
bb8a79f3: am
998f49eb: am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
d37b303959e43d518405226c389231f7bb3927e6':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 03:15:13 +0000 (19:15 -0800)]
am
bb8a79f3: am
998f49eb: am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
bb8a79f370b1f9ef7d1b5d66d23f8599b35c0ac8':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 02:47:15 +0000 (18:47 -0800)]
am
998f49eb: am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
998f49ebaee778df6395ecdcc15bce1dcd0124fc':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 02:45:26 +0000 (18:45 -0800)]
am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
404d7eb0029e1dcb94d38b0595fdd84345207b0a':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 02:43:16 +0000 (02:43 +0000)]
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
Doris Liu [Wed, 6 Nov 2013 02:41:13 +0000 (18:41 -0800)]
am
4d2c4c02: am
f71d895f: am
bb9e67ec: am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
4d2c4c02e6931a14476f048e35eb522cf2dc20f0':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:38:47 +0000 (18:38 -0800)]
am
f71d895f: am
bb9e67ec: am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
f71d895fb1b7ac9096b1c9bf9beab8d1cd07404b':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:09:21 +0000 (18:09 -0800)]
am
bb9e67ec: am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
bb9e67ece44a97539440ab41ce6cac05b5dc7107':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:06:55 +0000 (18:06 -0800)]
am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:04:37 +0000 (02:04 +0000)]
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
OSDN Git Service
