summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2019-07-14 14:40:33 +0200
committerGitHub <noreply@github.com>2019-07-14 14:40:33 +0200
commit539802ba0482012e2480a35c6e8c033137242e3c (patch)
treeebffdf4b43e6ab2b3b4d2941bff219e142b2a852
parent3b4fd3f4143d33552f80fdab45826c3e40c43d68 (diff)
parent53073c958c8a963b063793d3ee3fbd93c20e1d86 (diff)
downloadAntennaPod-539802ba0482012e2480a35c6e8c033137242e3c.zip
Merge pull request #3267 from libliboom/develop
Removed screenOrientation attributes in manifest
-rw-r--r--app/src/main/AndroidManifest.xml3
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java4
-rw-r--r--app/src/main/res/layout/gpodnetauth_credentials.xml4
-rw-r--r--app/src/main/res/layout/gpodnetauth_device.xml6
4 files changed, 7 insertions, 10 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96121b8b4..07b49decc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -318,8 +318,7 @@
<activity
android:name=".activity.gpoddernet.GpodnetAuthenticationActivity"
android:configChanges="orientation"
- android:label="@string/gpodnet_auth_label"
- android:screenOrientation="portrait">
+ android:label="@string/gpodnet_auth_label">
<intent-filter>
<action android:name=".activity.gpoddernet.GpodnetAuthenticationActivity"/>
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index df21f713d..2d7898d5b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -104,10 +104,6 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- }
-
private void setupLoginView(View view) {
final EditText username = view.findViewById(R.id.etxtUsername);
final EditText password = view.findViewById(R.id.etxtPassword);
diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml
index f995ae4cc..e8948fc52 100644
--- a/app/src/main/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
@@ -36,7 +36,7 @@
android:cursorVisible="true"
android:maxLines="1"
android:inputType="text"
- android:imeOptions="actionNext"
+ android:imeOptions="actionNext|flagNoFullscreen"
android:nextFocusForward="@id/etxtPassword"/>
<EditText
@@ -50,7 +50,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:cursorVisible="true"
- android:imeOptions="actionGo"
+ android:imeOptions="actionGo|flagNoFullscreen"
android:imeActionLabel="@string/gpodnetauth_login_butLabel"/>
<Button
diff --git a/app/src/main/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml
index 5840fe955..1f38bf457 100644
--- a/app/src/main/res/layout/gpodnetauth_device.xml
+++ b/app/src/main/res/layout/gpodnetauth_device.xml
@@ -30,7 +30,8 @@
android:layout_height="wrap_content"
android:hint="@string/gpodnetauth_device_caption"
android:layout_below="@id/txtvDescription"
- android:layout_margin="8dp"/>
+ android:layout_margin="8dp"
+ android:imeOptions="flagNoFullscreen"/>
<TextView
android:id="@+id/txtvDeviceID"
@@ -53,7 +54,8 @@
android:layout_toEndOf="@id/txtvDeviceID"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:layout_margin="8dp"/>
+ android:layout_margin="8dp"
+ android:imeOptions="flagNoFullscreen"/>
<Button
android:id="@+id/butCreateNewDevice"