summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlambroslambrou <lambroslambrou@chromium.org>2015-03-27 18:52:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-28 01:53:20 +0000
commita357285fdc24b17ac991cddc6ec902cb5d626fde (patch)
treede96756e68f0a807ba64078a5be33c07313f647d
parent954e37aad499a68771f3c517d1e4760e38986e0e (diff)
downloadchromium_src-a357285fdc24b17ac991cddc6ec902cb5d626fde.zip
chromium_src-a357285fdc24b17ac991cddc6ec902cb5d626fde.tar.gz
chromium_src-a357285fdc24b17ac991cddc6ec902cb5d626fde.tar.bz2
Android Chromoting: Handle keyboard-related system config changes.
This prevents Bluetooth (and other external) keyboards from shutting down the Desktop activity when activated or powered off. BUG=471435 Review URL: https://codereview.chromium.org/1046503002 Cr-Commit-Position: refs/heads/master@{#322696}
-rw-r--r--remoting/android/java/AndroidManifest.xml.jinja22
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
index 1b3209b..d539359 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -36,7 +36,7 @@
</intent-filter>
</activity>
<activity android:name="org.chromium.chromoting.Desktop"
- android:configChanges="orientation|screenSize"
+ android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:theme="@style/BaseTheme.Desktop"
android:windowSoftInputMode="adjustResize"/>
<activity android:name="org.chromium.chromoting.HelpActivity"