Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711bb40c authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Fix package path for p2p settings"

parents 716b05b8 9ef53578

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/xml/wireless_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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">

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+3 −4
Original line number Diff line number Diff line
@@ -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;