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

am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

Browse Source 
* commit '2cd50c45da99fa002375ad80a51d0c672cc09572':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
This commit is contained in:
Zoltan Szatmary-Ban
2015-07-08 12:25:55 +00:00
committed by Android Git Automerger
parent 89be2eeab0 2cd50c45da
commit 2f279c3a12
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
View File

@@ -24,14 +24,13 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.os.UserManager;
import com.android.settings.R; import com.android.settings.R;
/** /**
* UI for the USB chooser dialog. * UI for the USB chooser dialog.
* *
* TODO: Don't show some UI elements if UserManager.DISALLOW_USB_FILE_TRANSFER is disabled.
*/ */
public class UsbModeChooserActivity extends Activity { public class UsbModeChooserActivity extends Activity {
@@ -41,10 +40,19 @@ public class UsbModeChooserActivity extends Activity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE); mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
CharSequence[] items;
UserManager userManager =
(UserManager) getSystemService(Context.USER_SERVICE);
if (userManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
items = new CharSequence[] { getText(R.string.usb_use_charging_only) };
} else {
items = getResources().getTextArray(R.array.usb_available_functions);
}
final AlertDialog levelDialog; final AlertDialog levelDialog;
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.usb_use); builder.setTitle(R.string.usb_use);
builder.setSingleChoiceItems(R.array.usb_available_functions, getCurrentFunction(), builder.setSingleChoiceItems(items, getCurrentFunction(),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {