OSDN Git Service
Baligh Uddin [Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)]
am
036400b3: (-s ours) am
21b8cb69: (-s ours) Import translations. DO NOT MERGE
* commit '
036400b3389a8f5707ce7ce14138cbf65f891e4b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)]
am
01afd999: (-s ours) Import translations. DO NOT MERGE
* commit '
01afd9992560775e0c7420a0f86d11d625717f80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 21:48:33 +0000 (21:48 +0000)]
am
21b8cb69: (-s ours) Import translations. DO NOT MERGE
* commit '
21b8cb696c05ef5207d290f3a1ed52453e58f525':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 10:36:34 +0000 (03:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bef6048568c35ef35de13ca1cfb42e663622877
Auto-generated-cl: translation import
Baligh Uddin [Thu, 24 Jul 2014 10:34:53 +0000 (03:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I991834972e54ce3ad2020dc2244a5c139aa66c32
Auto-generated-cl: translation import
Alan Newberger [Wed, 23 Jul 2014 22:48:35 +0000 (22:48 +0000)]
am
7bc335f4: Upgrade mode index settings after mode indices were cleaned
* commit '
7bc335f4c69b8630f1619b2235991173fd8540a5':
Upgrade mode index settings after mode indices were cleaned
Alan Newberger [Wed, 23 Jul 2014 18:25:07 +0000 (11:25 -0700)]
Upgrade mode index settings after mode indices were cleaned
Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml,
upgrades were found to crash when settings referred to the old, now nonexistent mode value.
This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the
new value. Tested and works properly with mode preservation.
Bug:
16467318
Change-Id: I1352a940285687af38290250d7a06b5b7c421338
Alan Newberger [Wed, 23 Jul 2014 17:03:02 +0000 (17:03 +0000)]
am
62c20bfb: Modify Camera settings scope enforcement from crash to warning
* commit '
62c20bfb063743d636300ba49b89f16c6f2546d0':
Modify Camera settings scope enforcement from crash to warning
Alan Newberger [Wed, 23 Jul 2014 01:46:41 +0000 (18:46 -0700)]
Modify Camera settings scope enforcement from crash to warning
Several bugs have appeared particularly for flash settings, where the app
is attempting to get a scope per the new SettingsManager, and the camera
is already closed meaning there is no valid scope. With this change, such
situations will be logged with call stack traces, so if we see deviant
user behavior we'll know the source. Monkeys should no longer trip settings
crashes with this change.
Bug:
16483952
Bug:
16491601
Change-Id: I26487bc58909a05183563f59ae3cfba571f2504e
Spike Sprague [Tue, 22 Jul 2014 18:26:33 +0000 (18:26 +0000)]
am
dde95571: Merge "filmstip quantumification" into ub-camera-glacier
* commit '
dde95571f3c1ea5f733dbdcf7a8e4ffe15a83e08':
filmstip quantumification
Baligh Uddin [Tue, 22 Jul 2014 17:22:11 +0000 (17:22 +0000)]
am
3736714d: (-s ours) am
373c970d: (-s ours) Import translations. DO NOT MERGE
* commit '
3736714d7aecbd26124e575ce84a1a34187c32b5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 17:18:30 +0000 (17:18 +0000)]
am
373c970d: (-s ours) Import translations. DO NOT MERGE
* commit '
373c970d5d2c7877890f912e072f232438831b76':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 17:15:52 +0000 (17:15 +0000)]
am
f953e32e: (-s ours) Import translations. DO NOT MERGE
* commit '
f953e32e36cbfa80dc801d344f65776f95493617':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 03:46:57 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0744574beeef51f9608dee64748795e6b9d2c852
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Jul 2014 03:46:21 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27bcda4f98bb79dca1e4e06cd5b4abd036245357
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Jul 2014 03:45:09 +0000 (20:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90b31e5a34b7ae3463e8006f501b45b031c58025
Auto-generated-cl: translation import
Spike Sprague [Mon, 21 Jul 2014 18:59:45 +0000 (18:59 +0000)]
am
dd19c33c: Merge "fixing mode -> color mapping" into ub-camera-glacier
* commit '
dd19c33c1b41c0f888431a46cf8fa4bb8d1bf366':
fixing mode -> color mapping
Sascha Haeberling [Mon, 21 Jul 2014 18:39:35 +0000 (18:39 +0000)]
am
f15d63e8: Make sure to set an audio source using MediaRecorder.
* commit '
f15d63e82af0ecf141ae16cae11b1cffbb8a8ab8':
Make sure to set an audio source using MediaRecorder.
Sascha Haeberling [Mon, 21 Jul 2014 18:31:13 +0000 (11:31 -0700)]
Make sure to set an audio source using MediaRecorder.
Bug:
16454543
Change-Id: Ic3bfb14bd7d37e5feda43e50eafcf2e687dee0ce
Spike Sprague [Mon, 21 Jul 2014 18:57:21 +0000 (18:57 +0000)]
Merge "fixing mode -> color mapping" into ub-camera-glacier
Spike Sprague [Mon, 21 Jul 2014 18:55:36 +0000 (11:55 -0700)]
fixing mode -> color mapping
bug:
16123081
Change-Id: I3694e575e8461f4faf6dec076f5afe2a320eaecc
Spike Sprague [Fri, 18 Jul 2014 18:39:17 +0000 (18:39 +0000)]
am
17038432: Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
* commit '
170384322694cbcebc2dc3e889ad1a5fb4bf0f25':
clean out timelapse stuff from codebase
Alan Newberger [Fri, 18 Jul 2014 17:33:28 +0000 (17:33 +0000)]
am
39529585: Route switch preferences through SettingManager
* commit '
39529585aee23703553c551eadceca78742cf52b':
Route switch preferences through SettingManager
Alan Newberger [Thu, 17 Jul 2014 16:55:34 +0000 (09:55 -0700)]
Route switch preferences through SettingManager
This CL adds a custom switch which uses SettingsManager to control
boolean settings. It relocates SettingsManager to the application
to allow access from multiple activities.
Bug:
16327665
Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
Sascha Haeberling [Thu, 17 Jul 2014 22:28:41 +0000 (22:28 +0000)]
am
71ae986c: resolved conflicts for merge of
dcea7639 to ub-camera-glacier
* commit '
71ae986c611c49674d53af48e56da629de0ace93':
Speed up lockscreen start-up time.
Sascha Haeberling [Thu, 17 Jul 2014 22:05:26 +0000 (15:05 -0700)]
resolved conflicts for merge of
dcea7639 to ub-camera-glacier
Change-Id: I151b172d3e415a529375351ba8c038308e593cd5
Sascha Haeberling [Thu, 17 Jul 2014 21:06:02 +0000 (14:06 -0700)]
Speed up lockscreen start-up time.
Bug:
16375664
- Avoid unnecessary camera open/close loop (~350ms)
- Don't load sounds and do other init work when not needed.
Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3
Spike Sprague [Fri, 18 Jul 2014 18:36:32 +0000 (18:36 +0000)]
Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
Spike Sprague [Wed, 16 Jul 2014 22:47:32 +0000 (15:47 -0700)]
clean out timelapse stuff from codebase
Change-Id: Ibcf07302f3eea2800d1f36c918ffe1c3d93b8018
Spike Sprague [Tue, 22 Jul 2014 18:23:05 +0000 (18:23 +0000)]
Merge "filmstip quantumification" into ub-camera-glacier
Spike Sprague [Mon, 21 Jul 2014 20:19:10 +0000 (13:19 -0700)]
filmstip quantumification
bug:
16456504
Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce
Spike Sprague [Wed, 16 Jul 2014 22:47:27 +0000 (22:47 +0000)]
am
609ee052: updating mode selector colors
* commit '
609ee052e3e9a62319afe9a8d4a1377dee0b9c4f':
updating mode selector colors
Spike Sprague [Wed, 16 Jul 2014 21:33:59 +0000 (14:33 -0700)]
updating mode selector colors
bug:
16123081
Change-Id: Ibe0b886f73fa934a94e7a1b534a67b56fdeb60d7
Sascha Haeberling [Wed, 16 Jul 2014 00:04:13 +0000 (00:04 +0000)]
am
78683612: Store temp session data in \'cache\' directory, not data.
* commit '
7868361295f07205fb49d3d03e886f1c7d2eb08b':
Store temp session data in 'cache' directory, not data.
Sascha Haeberling [Tue, 15 Jul 2014 23:48:20 +0000 (16:48 -0700)]
Store temp session data in 'cache' directory, not data.
Bug:
16010129
Change-Id: I06ff67d2917580e1f44bdb6686a9371239bccfef
Sascha Haeberling [Tue, 15 Jul 2014 21:49:12 +0000 (21:49 +0000)]
am
ca82f50d: Don\'t try to show storage hint if activity is no longer running.
* commit '
ca82f50dc211daad82abb91bcc35f50d1d81d4e3':
Don't try to show storage hint if activity is no longer running.
Sascha Haeberling [Tue, 15 Jul 2014 15:54:40 +0000 (08:54 -0700)]
Don't try to show storage hint if activity is no longer running.
Bug:
16198208
Change-Id: I6a6c92286c98cff8b55434a7a0d011bf5043d183
Sascha Haeberling [Tue, 15 Jul 2014 00:04:40 +0000 (00:04 +0000)]
am
a899a5a5: am
3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '
a899a5a5052921b6e5f172b8ebe06d1e2f84c7f4':
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Sascha Haeberling [Tue, 15 Jul 2014 00:04:39 +0000 (00:04 +0000)]
am
27450ecc: Don\'t crash if filename could not be found for ID.
* commit '
27450ecc1adc01ea7bc4355edcfe549c8a31b0a9':
Don't crash if filename could not be found for ID.
Sascha Haeberling [Tue, 15 Jul 2014 00:00:52 +0000 (00:00 +0000)]
am
3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '
3c6de14b6e771b6eab84428d53543b066324b8f0':
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Sascha Haeberling [Mon, 14 Jul 2014 23:18:38 +0000 (16:18 -0700)]
Don't crash if filename could not be found for ID.
Bug:
15890671
This is only used for logging but Monkey's crash on master.
Change-Id: I0d08d0a82fd6a7073c7aa1924c21beeb66859577
Sascha Haeberling [Mon, 14 Jul 2014 19:23:36 +0000 (12:23 -0700)]
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Bug:
16217551
Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431
Sascha Haeberling [Fri, 11 Jul 2014 17:36:21 +0000 (17:36 +0000)]
am
49e49add: am
c17a5664: Prevent a monkey-generated crash.
* commit '
49e49adde177d7009df9682ce56e8c74cb6ed240':
Prevent a monkey-generated crash.
Sascha Haeberling [Fri, 11 Jul 2014 17:26:29 +0000 (17:26 +0000)]
am
c17a5664: Prevent a monkey-generated crash.
* commit '
c17a56643186dee671bf6e7dec54cd558a7ecb2f':
Prevent a monkey-generated crash.
Sascha Haeberling [Thu, 10 Jul 2014 21:43:13 +0000 (14:43 -0700)]
Prevent a monkey-generated crash.
Bug:
16191092
Change-Id: Ic6488381ed6f80184401c925dd6891126736019f
Sol Boucher [Wed, 9 Jul 2014 23:01:07 +0000 (23:01 +0000)]
am
3755aefa: Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
* commit '
3755aefaafc21860394b3101177d9f730706e846':
Eliminate unnecessary context in FragmentActivity constructor
Sol Boucher [Wed, 9 Jul 2014 22:58:52 +0000 (22:58 +0000)]
Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
Sol Boucher [Wed, 9 Jul 2014 22:44:00 +0000 (15:44 -0700)]
Eliminate unnecessary context in FragmentActivity constructor
Use the one that was already being obtained from getApplicationContext() instead
Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2
Sol Boucher [Wed, 9 Jul 2014 21:38:46 +0000 (21:38 +0000)]
am
c8f40886: Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
* commit '
c8f408861d5703f74eb8f6d31961c0768953f966':
Make app build against updated frameworks/ex portability library
Sam Judd [Wed, 9 Jul 2014 20:30:08 +0000 (20:30 +0000)]
am
e36bb1bc: Merge commit \'
acfad92c\' into merge_crash_fix
* commit '
e36bb1bc05a9bc3ca795a6fd918979a05b284aad':
Fix crash when dimensions are <= 0.
Sam Judd [Wed, 9 Jul 2014 20:00:59 +0000 (13:00 -0700)]
Merge commit '
acfad92c' into merge_crash_fix
Conflicts:
src/com/android/camera/data/LocalMediaData.java
Change-Id: I7000054e53f1258a3de2253a816b091689d62da5
Sam Judd [Wed, 9 Jul 2014 18:17:26 +0000 (11:17 -0700)]
Fix crash when dimensions are <= 0.
Change-Id: I78531a025cf209b59f768ab38ea96ce0fe44c401
Sol Boucher [Wed, 9 Jul 2014 21:35:09 +0000 (21:35 +0000)]
Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
Sol Boucher [Wed, 2 Jul 2014 17:37:18 +0000 (10:37 -0700)]
Make app build against updated frameworks/ex portability library
This is necessary to make the app build and run against the updated library, and
specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy
contracts.
Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd
Spike Sprague [Mon, 7 Jul 2014 22:30:52 +0000 (22:30 +0000)]
am
10a16544: am
1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
* commit '
10a16544048c3e5e1b380219144d501351163dc1':
previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
Spike Sprague [Mon, 7 Jul 2014 22:28:31 +0000 (22:28 +0000)]
am
1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
* commit '
1d1af90609b7a896f74dda83b7f22f91b50e70cf':
previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
Spike Sprague [Mon, 7 Jul 2014 21:45:38 +0000 (21:45 +0000)]
am
d921ee08: am
04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
* commit '
d921ee087e7becd6c99db9f9ef971e9611198414':
make ProgressOverlay obey left and top of its bounding Rect
Spike Sprague [Mon, 7 Jul 2014 21:41:12 +0000 (21:41 +0000)]
am
04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
* commit '
04ebcbbab90b1ccb263247c39b45ade232de7b0a':
make ProgressOverlay obey left and top of its bounding Rect
Spike Sprague [Mon, 7 Jul 2014 21:34:09 +0000 (14:34 -0700)]
make ProgressOverlay obey left and top of its bounding Rect
bug:
16061226
Change-Id: If2e3748963191963f6e9223699cb0144a9710d5d
Spike Sprague [Mon, 7 Jul 2014 19:45:46 +0000 (19:45 +0000)]
am
a59e9fc9: am
90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake
* commit '
a59e9fc9eef42219cd5a3ec5018de309139782a5':
disable shutter button when mode list is open
Spike Sprague [Mon, 7 Jul 2014 19:42:11 +0000 (19:42 +0000)]
am
90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake
* commit '
90defd62b3d0eed8cf3906c7f8394fc9ad401759':
disable shutter button when mode list is open
Sascha Haeberling [Mon, 7 Jul 2014 18:37:48 +0000 (18:37 +0000)]
am
c78ffd70: resolved conflicts for merge of
ff899495 to ub-camera-glacier
* commit '
c78ffd7011c9841697a75bdc48c7011e806afaee':
Fix regression: Update summary when quality settings change.
Sascha Haeberling [Mon, 7 Jul 2014 18:34:19 +0000 (11:34 -0700)]
resolved conflicts for merge of
ff899495 to ub-camera-glacier
Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
Sam Judd [Mon, 7 Jul 2014 18:10:26 +0000 (18:10 +0000)]
am
336e533e: am
950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
* commit '
336e533e6f41239bef2b236beabaae93e11301af':
Ensure photosphere/pano thumbs are always shown.
Sam Judd [Mon, 7 Jul 2014 18:07:19 +0000 (18:07 +0000)]
am
950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
* commit '
950fb6b8e8e7663f09428f25f2f788a3a191baef':
Ensure photosphere/pano thumbs are always shown.
Spike Sprague [Mon, 7 Jul 2014 22:24:56 +0000 (22:24 +0000)]
Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
Spike Sprague [Mon, 7 Jul 2014 22:13:27 +0000 (15:13 -0700)]
previous CL ag/496035 disabled shutter button clicks during shimmy,
scaling back a11y disabling on shutter button
Change-Id: I1c788ccbd946b43774f9f4a7bf629c4e019f20f9
Sascha Haeberling [Mon, 7 Jul 2014 18:07:59 +0000 (18:07 +0000)]
Merge "Fix regression: Update summary when quality settings change." into ub-camera-fishlake
Sascha Haeberling [Mon, 7 Jul 2014 17:59:19 +0000 (10:59 -0700)]
Fix regression: Update summary when quality settings change.
Bug:
16062378
Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f
Sam Judd [Mon, 7 Jul 2014 18:03:06 +0000 (18:03 +0000)]
Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
Sam Judd [Mon, 7 Jul 2014 17:40:12 +0000 (10:40 -0700)]
Ensure photosphere/pano thumbs are always shown.
Bug:
16061224
Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c
Spike Sprague [Mon, 7 Jul 2014 17:35:08 +0000 (17:35 +0000)]
am
6d427e30: am
1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
* commit '
6d427e305cdd6e8a539b7d30858609868598feab':
disable talkback a11y navigation on mode list during shimmy
Spike Sprague [Mon, 7 Jul 2014 17:31:52 +0000 (17:31 +0000)]
am
1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
* commit '
1e89c9196d91175bcc3d878c95b230d93cd5280c':
disable talkback a11y navigation on mode list during shimmy
Baligh Uddin [Sun, 6 Jul 2014 21:32:46 +0000 (21:32 +0000)]
am
7e329db9: (-s ours) am
3c866166: (-s ours) am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
7e329db98adb636bf2e39595ca9a00db095915d8':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:27:36 +0000 (21:27 +0000)]
am
1b00c5da: (-s ours) am
aca13396: (-s ours) am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
1b00c5da58469bbcbe97b5b62e06d3c9be200c38':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:27:26 +0000 (21:27 +0000)]
am
3c866166: (-s ours) am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
3c8661666ceb9049061ebf2b120cb51276c1cece':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:31 +0000 (21:24 +0000)]
am
025a5b22: (-s ours) am
e6828fb6: (-s ours) Import translations. DO NOT MERGE
* commit '
025a5b2237e617985f39002b9da7ea413a644394':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:28 +0000 (21:24 +0000)]
am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
c0f064313c2fa318a4c21947ab57e7c1e3c67fc9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:15 +0000 (21:24 +0000)]
am
aca13396: (-s ours) am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
aca13396a6d18542c9550f7ff5b6a262c4e1937d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:23 +0000 (21:21 +0000)]
am
7558467a: (-s ours) Import translations. DO NOT MERGE
* commit '
7558467ab12ddd4f74c4844de50e9c1813099293':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:21 +0000 (21:21 +0000)]
am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
2ee019bee75241d3e1f338d04491900a65c1c79f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:08 +0000 (21:21 +0000)]
am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
cb0f330b34124e72504e58e9a15de5cd2e08a2dd':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:07 +0000 (21:21 +0000)]
am
e6828fb6: (-s ours) Import translations. DO NOT MERGE
* commit '
e6828fb681ad7e70afaaf9cee54300f870b51cff':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:08:55 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2729ddae57af6f814e3939d2d275363d5cb3429d
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:08:18 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c7a134d69f9dfe74dd2fa8dfbf4b807d455d211
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:06:58 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3403c2c617c86e31b946c9343176c600da4349d
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:06:20 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1c48d20759de0043d1a2252af132382c02f1b5a
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:00:18 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90257ae7d06ce7585fa4293cbe18703d2e9c1e6c
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 2 Jul 2014 19:14:14 +0000 (19:14 +0000)]
am
e81455fa: Change HDR plus flash default to off.
* commit '
e81455faed1929f5af2dd89812c437efcb60c7c4':
Change HDR plus flash default to off.
Spike Sprague [Mon, 7 Jul 2014 19:14:17 +0000 (19:14 +0000)]
Merge "disable shutter button when mode list is open" into ub-camera-fishlake
Spike Sprague [Thu, 3 Jul 2014 00:08:43 +0000 (17:08 -0700)]
disable shutter button when mode list is open
bug:
16042076
Change-Id: I0b8fad7b40bb348a3be0fa3c9457a1ceb6a49b05
Erin Dahlgren [Wed, 2 Jul 2014 17:39:17 +0000 (10:39 -0700)]
Change HDR plus flash default to off.
As Gcam is still experimenting with their flash setting,
turn it off so there is no accidental auto flash.
Change-Id: Id7a372a0b0123a43ff11d9a0ec8267e30d15a2b4
Spike Sprague [Mon, 7 Jul 2014 17:27:05 +0000 (17:27 +0000)]
Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
Spike Sprague [Wed, 2 Jul 2014 22:58:32 +0000 (15:58 -0700)]
disable talkback a11y navigation on mode list during shimmy
bug:
16042079
Change-Id: Ied2c91326d924bbd032853c84bba19a6dc75c992
Spike Sprague [Wed, 2 Jul 2014 18:46:00 +0000 (18:46 +0000)]
am
5f828150: am
02b9b9af: move intent review image view to proper spot in view hierachy
* commit '
5f828150c228d69fdeafb06609918073d5be47f5':
move intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:40:49 +0000 (18:40 +0000)]
am
02b9b9af: move intent review image view to proper spot in view hierachy
* commit '
02b9b9af097ac7886ec1d23392cd87c9fbcb186f':
move intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:26:28 +0000 (11:26 -0700)]
move intent review image view to proper spot in view hierachy
bug:
15729563
Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a
Sascha Häberling [Wed, 2 Jul 2014 18:18:44 +0000 (18:18 +0000)]
am
70310d79: am
d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
* commit '
70310d793f9b2e80bd85698718818da7bf8b72e3':
Pass the real file length to MediaStore.
Doris Liu [Wed, 2 Jul 2014 18:18:44 +0000 (18:18 +0000)]
am
2b21a99b: (-s ours) am
af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
* commit '
2b21a99b96fc1679ce914fd4fcccc4b54426f7dd':
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
Sascha Haeberling [Wed, 2 Jul 2014 18:18:43 +0000 (18:18 +0000)]
am
6f283264: am
aa52b3d2: Prevent crash for when newData cannot be found.
* commit '
6f2832644260b7ddf540c43d4fb28d22fe679b7f':
Prevent crash for when newData cannot be found.
OSDN Git Service
