Merge "Import translations. DO NOT MERGE"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bdf8296..78b16bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1201,7 +1201,7 @@
<activity android:name="ActivityPicker"
android:label="@string/activity_picker_label"
- android:theme="@*android:style/Theme.Dialog.Alert"
+ android:theme="@*android:style/Theme.Holo.Dialog.Alert"
android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.intent.action.PICK_ACTIVITY" />
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 4824be6..7a7d0b0 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -21,7 +21,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingBottom="8dip">
<LinearLayout android:id="@+id/info"
style="@style/wifi_section" />
@@ -38,7 +39,7 @@
android:textDirection="locale" />
<EditText android:id="@+id/ssid"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:maxLength="32"
android:singleLine="true"
android:inputType="textNoSuggestions" />
@@ -123,7 +124,7 @@
android:text="@string/wifi_eap_identity" />
<EditText android:id="@+id/identity"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout>
@@ -136,7 +137,7 @@
android:text="@string/wifi_eap_anonymous" />
<EditText android:id="@+id/anonymous"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout>
@@ -149,7 +150,7 @@
android:text="@string/wifi_password" />
<EditText android:id="@+id/password"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:password="true" />
</LinearLayout>
@@ -218,7 +219,7 @@
android:text="@string/proxy_hostname_label" />
<EditText android:id="@+id/proxy_hostname"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:hint="@string/proxy_hostname_hint"
android:inputType="textNoSuggestions"
android:singleLine="true" />
@@ -229,7 +230,7 @@
android:text="@string/proxy_port_label" />
<EditText android:id="@+id/proxy_port"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:hint="@string/proxy_port_hint"
android:inputType="number"
android:singleLine="true" />
@@ -240,7 +241,7 @@
android:text="@string/proxy_exclusionlist_label" />
<EditText android:id="@+id/proxy_exclusionlist"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:hint="@string/proxy_exclusionlist_hint"
android:inputType="textNoSuggestions"
android:singleLine="true" />
@@ -272,7 +273,7 @@
android:text="@string/wifi_ip_address" />
<EditText android:id="@+id/ipaddress"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:hint="@string/wifi_ip_address_hint"
android:inputType="textNoSuggestions" />
@@ -285,7 +286,7 @@
android:text="@string/wifi_gateway" />
<EditText android:id="@+id/gateway"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:hint="@string/wifi_gateway_hint"
android:inputType="textNoSuggestions" />
@@ -298,7 +299,7 @@
android:text="@string/wifi_network_prefix_length" />
<EditText android:id="@+id/network_prefix_length"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:hint="@string/wifi_network_prefix_length_hint"
android:inputType="number" />
@@ -310,7 +311,7 @@
android:text="@string/wifi_dns1" />
<EditText android:id="@+id/dns1"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:hint="@string/wifi_dns1_hint"
android:inputType="textNoSuggestions" />
@@ -323,7 +324,7 @@
android:text="@string/wifi_dns2" />
<EditText android:id="@+id/dns2"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:singleLine="true"
android:hint="@string/wifi_dns2_hint"
android:inputType="textNoSuggestions" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3aed397..4c3d4b7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -587,8 +587,9 @@
<item>read ICC SMS</item>
<item>write ICC SMS</item>
<item>modify settings</item>
+ <item>draw on top</item>
</string-array>
-
+
<!-- User display names for app ops codes -->
<string-array name="app_ops_labels">
<item>Location</item>
@@ -615,6 +616,7 @@
<item>Receive SMS/MMS</item>
<item>Send SMS/MMS</item>
<item>Modify settings</item>
+ <item>Draw on top</item>
</string-array>
<!-- Titles for the list of long press timeout options. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dda22d9..ebd8722 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -121,12 +121,20 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
+ <item name="android:textAlignment">viewStart</item>
</style>
<style name="wifi_item_content">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
+ <item name="android:textAlignment">viewStart</item>
+ </style>
+
+ <style name="wifi_item_edit_content">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:textSize">18sp</item>
</style>
<style name="wifi_section">
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 5e7098a..288977d 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -149,10 +149,12 @@
new int[] { AppOpsManager.OP_VIBRATE,
AppOpsManager.OP_POST_NOTIFICATION,
AppOpsManager.OP_CALL_PHONE,
- AppOpsManager.OP_WRITE_SETTINGS },
+ AppOpsManager.OP_WRITE_SETTINGS,
+ AppOpsManager.OP_SYSTEM_ALERT_WINDOW },
new boolean[] { false,
false,
true,
+ true,
true }
);
@@ -254,10 +256,13 @@
private final ArrayList<AppOpsManager.OpEntry> mSwitchOps
= new ArrayList<AppOpsManager.OpEntry>();
private final AppEntry mApp;
+ private final int mSwitchOrder;
- public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app) {
+ public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app,
+ int switchOrder) {
mPkgOps = pkg;
mApp = app;
+ mSwitchOrder = switchOrder;
mApp.addOp(this, op);
mOps.add(op);
mSwitchOps.add(op);
@@ -293,6 +298,10 @@
return mApp;
}
+ public int getSwitchOrder() {
+ return mSwitchOrder;
+ }
+
public AppOpsManager.PackageOps getPackageOps() {
return mPkgOps;
}
@@ -366,6 +375,9 @@
private final Collator sCollator = Collator.getInstance();
@Override
public int compare(AppOpEntry object1, AppOpEntry object2) {
+ if (object1.getSwitchOrder() != object2.getSwitchOrder()) {
+ return object1.getSwitchOrder() < object2.getSwitchOrder() ? -1 : 1;
+ }
if (object1.isRunning() != object2.isRunning()) {
// Currently running ops go first.
return object1.isRunning() ? -1 : 1;
@@ -380,7 +392,7 @@
};
private void addOp(List<AppOpEntry> entries, AppOpsManager.PackageOps pkgOps,
- AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge) {
+ AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge, int switchOrder) {
if (allowMerge && entries.size() > 0) {
AppOpEntry last = entries.get(entries.size()-1);
if (last.getAppEntry() == appEntry) {
@@ -399,7 +411,7 @@
entry.addOp(opEntry);
return;
}
- entry = new AppOpEntry(pkgOps, opEntry, appEntry);
+ entry = new AppOpEntry(pkgOps, opEntry, appEntry, switchOrder);
if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
+ pkgOps.getPackageName() + ": making new " + entry);
entries.add(entry);
@@ -438,12 +450,14 @@
final ArrayList<String> perms = new ArrayList<String>();
final ArrayList<Integer> permOps = new ArrayList<Integer>();
+ final int[] opToOrder = new int[AppOpsManager._NUM_OP];
for (int i=0; i<tpl.ops.length; i++) {
if (tpl.showPerms[i]) {
String perm = AppOpsManager.opToPermission(tpl.ops[i]);
if (perm != null && !perms.contains(perm)) {
perms.add(perm);
permOps.add(tpl.ops[i]);
+ opToOrder[tpl.ops[i]] = i;
}
}
}
@@ -464,7 +478,8 @@
}
for (int j=0; j<pkgOps.getOps().size(); j++) {
AppOpsManager.OpEntry opEntry = pkgOps.getOps().get(j);
- addOp(entries, pkgOps, appEntry, opEntry, packageName == null);
+ addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+ packageName == null ? 0 : opToOrder[opEntry.getOp()]);
}
}
}
@@ -521,7 +536,8 @@
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0);
dummyOps.add(opEntry);
- addOp(entries, pkgOps, appEntry, opEntry, packageName == null);
+ addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+ packageName == null ? 0 : opToOrder[opEntry.getOp()]);
}
}
}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 373763d..c412b37 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -612,6 +612,11 @@
setSelection(mEapUserCertSpinner, config.enterpriseConfig.getClientCertificate());
mEapIdentityView.setText(config.enterpriseConfig.getIdentity());
mEapAnonymousView.setText(config.enterpriseConfig.getAnonymousIdentity());
+ } else {
+ // Choose a default for a new network and show only appropriate
+ // fields
+ mEapMethodSpinner.setSelection(Eap.PEAP);
+ showEapFieldsByMethod(Eap.PEAP);
}
} else {
showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 191260a..138a9d3 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -28,6 +28,7 @@
import android.content.IntentFilter;
import android.net.NetworkInfo;
import android.net.wifi.p2p.WifiP2pConfig;
+import android.net.wifi.p2p.WifiP2pInfo;
import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pGroup;
@@ -87,6 +88,7 @@
private boolean mWifiP2pSearching;
private int mConnectedDevices;
private WifiP2pGroup mConnectedGroup;
+ private boolean mLastGroupFormed = false;
private PreferenceGroup mPeersGroup;
private PreferenceGroup mPersistentGroup;
@@ -122,15 +124,19 @@
if (mWifiP2pManager == null) return;
NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
WifiP2pManager.EXTRA_NETWORK_INFO);
+ WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra(
+ WifiP2pManager.EXTRA_WIFI_P2P_INFO);
if (mWifiP2pManager != null) {
mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this);
}
if (networkInfo.isConnected()) {
if (DBG) Log.d(TAG, "Connected");
- } else {
+ } else if (mLastGroupFormed != true) {
//start a search when we are disconnected
+ //but not on group removed broadcast event
startSearch();
}
+ mLastGroupFormed = wifip2pinfo.groupFormed;
} else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {
mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);