diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 02:29:14 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 02:29:14 +0000 |
| commit | ed16608f1f22bb0c2254a060d271437e6160c2c0 (patch) | |
| tree | c4018847539dbf514d92d200da0743b95344eebf | |
| parent | 00f53cdf3f174615d04fc38897a49635fb3193b9 (diff) | |
| download | chromium_src-ed16608f1f22bb0c2254a060d271437e6160c2c0.zip chromium_src-ed16608f1f22bb0c2254a060d271437e6160c2c0.tar.gz chromium_src-ed16608f1f22bb0c2254a060d271437e6160c2c0.tar.bz2 | |
Make ActionBar initially visible when connecting to a Chromoting host.
Removed code that hid the ActionBar whenever the display area changed
size. As a side-effect, the ActionBar no longer disappears when the
keyboard is shown.
Previously, the ActionBar was overlayed so that it obscured the top
portion of the remote desktop. This is no longer desirable now that the
ActionBar is visible by default, so this CL restores the default
ActionBar behavior to resize the View when shown/hidden.
BUG=333129
Review URL: https://codereview.chromium.org/132933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244412 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/android/java/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/DesktopView.java | 2 | ||||
| -rw-r--r-- | remoting/remoting_android.gypi | 1 | ||||
| -rw-r--r-- | remoting/resources/styles.xml | 8 |
4 files changed, 0 insertions, 12 deletions
diff --git a/remoting/android/java/AndroidManifest.xml b/remoting/android/java/AndroidManifest.xml index 26b6d77..dd27f1e 100644 --- a/remoting/android/java/AndroidManifest.xml +++ b/remoting/android/java/AndroidManifest.xml @@ -18,7 +18,6 @@ </activity> <activity android:name="Desktop" android:configChanges="orientation|screenSize" - android:theme="@style/Theme_ElusiveActionBar" android:windowSoftInputMode="adjustResize"/> </application> </manifest> diff --git a/remoting/android/java/src/org/chromium/chromoting/DesktopView.java b/remoting/android/java/src/org/chromium/chromoting/DesktopView.java index 53c4b0a..5dd303b 100644 --- a/remoting/android/java/src/org/chromium/chromoting/DesktopView.java +++ b/remoting/android/java/src/org/chromium/chromoting/DesktopView.java @@ -257,8 +257,6 @@ public class DesktopView extends SurfaceView implements DesktopViewInterface, */ @Override public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - mActionBar.hide(); - synchronized (mRenderData) { mRenderData.screenWidth = width; mRenderData.screenHeight = height; diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index c46a63b..38b0b81 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -71,7 +71,6 @@ 'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/values', 'files': [ 'resources/strings.xml', - 'resources/styles.xml', ], }, ], diff --git a/remoting/resources/styles.xml b/remoting/resources/styles.xml deleted file mode 100644 index ecd4929..0000000 --- a/remoting/resources/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--Activity styles for the Android app--> -<resources> - <style name="Theme_ElusiveActionBar"> - <item name="android:windowActionBarOverlay">true</item> - <item name="android:actionBarStyle">@android:style/Widget.DeviceDefault.ActionBar.Solid</item> - </style> -</resources> |