From e8872c79fb8993c194a229e59cccb11d82fb6c76 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 28 Feb 2011 17:52:53 -0800
Subject: Make enter advance navigation or sign in
Bug: 3487066
Also cleaned up the layout
Change-Id: Iaa471ff8fcd793381cb98416493dcf707cbecc29
---
res/layout-land/http_authentication.xml | 65 ----------------------
res/layout/http_authentication.xml | 25 ++++-----
.../android/browser/HttpAuthenticationDialog.java | 13 +++++
3 files changed, 25 insertions(+), 78 deletions(-)
delete mode 100644 res/layout-land/http_authentication.xml
diff --git a/res/layout-land/http_authentication.xml b/res/layout-land/http_authentication.xml
deleted file mode 100644
index 3fa7e4f..0000000
--- a/res/layout-land/http_authentication.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
-
- <TableLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dip"
- android:gravity="center_horizontal" >
-
- <TableRow>
- <TextView android:id="@+id/username_view"
- android:text="@string/username"
- android:gravity="right"
- android:layout_marginLeft="20dip" />
-
- <EditText android:id="@+id/username_edit"
- android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
- android:gravity="fill_horizontal"
- android:layout_weight="1"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="20dip"
- android:layout_marginBottom="12dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:id="@+id/password_view"
- android:text="@string/password"
- android:gravity="right"
- android:layout_marginLeft="20dip" />
-
- <EditText android:id="@+id/password_edit"
- android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
- android:gravity="fill_horizontal"
- android:layout_weight="1"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="20dip"
- android:layout_marginBottom="12dip"
- android:password="true" />
- </TableRow>
- </TableLayout>
-
-</LinearLayout>
diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml
index cee3a42..856c45c 100644
--- a/res/layout/http_authentication.xml
+++ b/res/layout/http_authentication.xml
@@ -14,49 +14,48 @@
limitations under the License.
-->
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
android:orientation="vertical"
>
<TextView
- android:id="@+id/username_view"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/username"
- android:gravity="left"
android:layout_marginTop="12dip"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
<EditText
android:id="@+id/username_edit"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
android:scrollHorizontally="true"
android:inputType="text"
- android:gravity="fill_horizontal"
- android:layout_weight="1"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
- android:layout_marginBottom="12dip" />
+ android:layout_marginBottom="12dip"
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
- android:id="@+id/password_view"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/password"
- android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
<EditText
android:id="@+id/password_edit"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
android:scrollHorizontally="true"
android:inputType="textPassword"
- android:gravity="fill_horizontal"
- android:layout_weight="1"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
- android:layout_marginBottom="12dip" />
-</TableLayout>
+ android:layout_marginBottom="12dip"
+ android:singleLine="true"
+ android:imeOptions="actionDone" />
+</LinearLayout>
diff --git a/src/com/android/browser/HttpAuthenticationDialog.java b/src/com/android/browser/HttpAuthenticationDialog.java
index a9ba332..ac4119c 100644
--- a/src/com/android/browser/HttpAuthenticationDialog.java
+++ b/src/com/android/browser/HttpAuthenticationDialog.java
@@ -18,10 +18,13 @@ package com.android.browser;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
/**
* HTTP authentication dialog.
@@ -109,6 +112,16 @@ public class HttpAuthenticationDialog {
View v = factory.inflate(R.layout.http_authentication, null);
mUsernameView = (TextView) v.findViewById(R.id.username_edit);
mPasswordView = (TextView) v.findViewById(R.id.password_edit);
+ mPasswordView.setOnEditorActionListener(new OnEditorActionListener() {
+ @Override
+ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+ if (actionId == EditorInfo.IME_ACTION_DONE) {
+ mDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+ return true;
+ }
+ return false;
+ }
+ });
String title = mContext.getText(R.string.sign_in_to).toString().replace(
"%s1", mHost).replace("%s2", mRealm);
--
cgit v1.1