Merge "Dynamically showing "driving mode"" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-05-22 02:48:34 +00:00
committed by Android (Google) Code Review
2 changed files with 35 additions and 10 deletions

View File

@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice;
import android.content.Context;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -26,6 +27,9 @@ import com.android.settings.nfc.NfcPreferenceController;
*/
public class AdvancedConnectedDeviceController extends BasePreferenceController {
private static final String DRIVING_MODE_SETTINGS_ENABLED =
"gearhead:driving_mode_settings_enabled";
public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -47,10 +51,15 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
public static int getConnectedDevicesSummaryResourceId(Context context) {
final NfcPreferenceController nfcPreferenceController =
new NfcPreferenceController(context);
final boolean isDrivingModeAvailable = false;
return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
isDrivingModeAvailable);
isDrivingModeAvailable(context));
}
@VisibleForTesting
static boolean isDrivingModeAvailable(Context context) {
return Settings.System.
getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
}
@VisibleForTesting