PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix package path for p2p settings"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-08-04 10:29:30 -07:00
committed by Android (Google) Code Review
parent 716b05b860 9ef53578b8
commit 711bb40cc3
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -279,7 +279,7 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WifiP2pSettings" />
android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"

2
res/xml/wireless_settings.xml
View File

@@ -46,7 +46,7 @@
</PreferenceScreen>
<PreferenceScreen
android:fragment="com.android.settings.WifiP2pSettings"
android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
android:key="wifi_p2p_settings"
android:title="@string/wifi_p2p_settings_title"
android:summary="@string/wifi_p2p_settings_summary">

7
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.wifi.p2p;
import android.app.ActionBar;
import android.app.Activity;
@@ -43,9 +43,8 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Switch;
import com.android.settings.wifi.p2p.WifiP2pDialog;
import com.android.settings.wifi.p2p.WifiP2pEnabler;
import com.android.settings.wifi.p2p.WifiP2pPeer;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Arrays;
import java.util.List;