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

Merge "Misc fixes to search and UI."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-24 01:25:13 +00:00
committed by Android (Google) Code Review
parent 07894014d5 82be5f0c3f
commit 2cd55c1255
20 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/EncryptionAndCredential.java
View File

@@ -253,7 +253,7 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = new ArrayList<String>();
final List<String> keys = super.getNonIndexableKeys(context);
final UserManager um = UserManager.get(context);

2
src/com/android/settings/backup/BackupSettingsActivity.java
View File

@@ -110,7 +110,7 @@ public class BackupSettingsActivity extends Activity implements Indexable {
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = new ArrayList<String>();
final List<String> keys = super.getNonIndexableKeys(context);
// For non-primary user, no backup is available, so don't show it in search
// TODO: http://b/22388012

3
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -131,9 +131,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
PackageManager pm = context.getPackageManager();
final List<String> keys = new ArrayList<String>();
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);

2
src/com/android/settings/datausage/DataUsageMeteredSettings.java
View File

@@ -226,7 +226,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
@Override
public List<String> getNonIndexableKeys(Context context) {
final ArrayList<String> result = new ArrayList<String>();
final List<String> result = super.getNonIndexableKeys(context);
if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) {
result.add("mobile");
}

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -848,7 +848,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> niks = new ArrayList<>();
List<String> niks = super.getNonIndexableKeys(context);
// Duplicates in display
niks.add(KEY_AUTO_BRIGHTNESS);
niks.add(KEY_SCREEN_TIMEOUT);

2
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -207,7 +207,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = new ArrayList<>();
List<String> keys = super.getNonIndexableKeys(context);
// Remove master switch as a result
keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
return keys;

15
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -33,14 +33,13 @@ import android.view.ViewGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -162,11 +161,13 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> nonVisibleKeys = super.getNonIndexableKeys(context);
final PackageManager pm = context.getPackageManager();
if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null;
final List<String> nonVisibleKeys = new ArrayList<String>();
if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
return nonVisibleKeys;
}
nonVisibleKeys.add(PAYMENT_KEY);
return nonVisibleKeys;
}
};
};
}

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

@@ -198,7 +198,7 @@ public class WifiP2pSettings extends DashboardFragment
if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DIALOG_PEER)) {
WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER);
mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device);
mSelectedWifiPeer = new WifiP2pPeer(getPrefContext(), device);
}
if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
@@ -533,7 +533,7 @@ public class WifiP2pSettings extends DashboardFragment
if (DBG) Log.d(TAG, "List of available peers");
for (WifiP2pDevice peer: mPeers.getDeviceList()) {
if (DBG) Log.d(TAG, "-> " + peer);
mPeerCategoryController.addChild(new WifiP2pPeer(getActivity(), peer));
mPeerCategoryController.addChild(new WifiP2pPeer(getPrefContext(), peer));
if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
}
if (DBG) Log.d(TAG, " mConnectedDevices " + mConnectedDevices);