Merge "Bug 5161247: More... is aligned with other main menu entries"

diff --git a/res/drawable/empty_icon.xml b/res/drawable/empty_icon.xml
new file mode 100644 (file)
index 0000000..db55af5
--- /dev/null
+++ b/res/drawable/empty_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+   <size android:width="32dip" android:height="32dip" />
+   <solid android:color="@android:color/transparent" />
+</shape>

diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index b6e73e6..0f4dbb3 100644 (file)
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -54,7 +54,8 @@
         android:id="@+id/wireless_settings"
         android:title="@string/radio_controls_title"
         android:breadCrumbTitle="@string/wireless_networks_settings_title"
-        android:fragment="com.android.settings.WirelessSettings" />
+        android:fragment="com.android.settings.WirelessSettings"
+        android:icon="@drawable/empty_icon" />
 
     <!-- DEVICE -->
     <header android:title="@string/header_category_device" />