commit 3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13
author Jean-Baptiste Queru <jbq@google.com> Sun Sep 26 08:05:46 2010 -0700
committer Android Code Review <code-review@android.com> Sun Sep 26 08:05:46 2010 -0700
tree fd8b28a2f3ff95970dfa55e12ccdfbe36a2b9d9a
parent 16502e9479f96e3fc484192e0cd4c852c4fc8ea6
parent d5234bc84404560e15397625769eafb7784ed14e

Merge "BT: The Phone doesn't "wake up" when trying to pair with it."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 78c0f5b..1f9ebe4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -188,6 +188,7 @@
         </activity>
 
         <activity android:name=".vpn.VpnSettings"
+                android:label="@string/vpn_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -195,6 +196,7 @@
                 <action android:name="android.net.vpn.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
         </activity>
 

res/layout/bluetooth_pin_entry.xml

diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index 16b75fc..b0c1216 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -44,8 +44,9 @@
             android:layout_marginTop="20dip"
             android:layout_marginLeft="20dip"
             android:layout_marginRight="20dip"
+            android:inputType="textPassword"
             android:singleLine="true" />
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>