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

Settings UI for SIM access profile (1/2)

Browse Source 
Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
This commit is contained in:
Casper Bonde
2015-05-04 22:04:29 -07:00
committed by Andre Eisenbach
parent 3342d762e9
commit faadcd60e7
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -367,6 +367,12 @@
<!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] --> <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
<string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string> <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
<!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
<string name="bluetooth_sap_request">"SIM access request"</string>
<!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
<string name="bluetooth_sap_acceptance_dialog_text"><xliff:g id="device_name">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="device_name">%2$s?</xliff:g></string>
<!-- Date & time settings screen title --> <!-- Date & time settings screen title -->
<string name="date_and_time">Date &amp; time</string> <string name="date_and_time">Date &amp; time</string>
<!-- The title of the activity to pick a time zone. --> <!-- The title of the activity to pick a time zone. -->

14
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java Executable file → Normal file
View File

@@ -101,6 +101,8 @@ public class BluetoothPermissionActivity extends AlertActivity implements
showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType); showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType);
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) { } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
showDialog(getString(R.string.bluetooth_map_request), mRequestType); showDialog(getString(R.string.bluetooth_map_request), mRequestType);
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
showDialog(getString(R.string.bluetooth_sap_request), mRequestType);
} }
else { else {
Log.e(TAG, "Error: bad request type: " + mRequestType); Log.e(TAG, "Error: bad request type: " + mRequestType);
@@ -129,6 +131,9 @@ public class BluetoothPermissionActivity extends AlertActivity implements
case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS: case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
p.mView = createMapDialogView(); p.mView = createMapDialogView();
break; break;
case BluetoothDevice.REQUEST_TYPE_SIM_ACCESS:
p.mView = createSapDialogView();
break;
} }
p.mPositiveButtonText = getString(R.string.yes); p.mPositiveButtonText = getString(R.string.yes);
p.mPositiveButtonListener = this; p.mPositiveButtonListener = this;
@@ -183,6 +188,15 @@ public class BluetoothPermissionActivity extends AlertActivity implements
return mView; return mView;
} }
private View createSapDialogView() {
String mRemoteName = createRemoteName();
mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
messageView = (TextView)mView.findViewById(R.id.message);
messageView.setText(getString(R.string.bluetooth_sap_acceptance_dialog_text,
mRemoteName, mRemoteName));
return mView;
}
private void onPositive() { private void onPositive() {
if (DEBUG) Log.d(TAG, "onPositive"); if (DEBUG) Log.d(TAG, "onPositive");
sendReplyIntentToReceiver(true, true); sendReplyIntentToReceiver(true, true);

26
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -44,7 +44,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ; private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;
private static final String NOTIFICATION_TAG_MAP = "Message Access"; private static final String NOTIFICATION_TAG_MAP = "Message Access";
private static final String NOTIFICATION_TAG_SAP = "SIM Access";
Context mContext; Context mContext;
int mRequestType; int mRequestType;
@@ -139,6 +139,11 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
message = context.getString(R.string.bluetooth_map_acceptance_dialog_text, message = context.getString(R.string.bluetooth_map_acceptance_dialog_text,
deviceName, deviceName); deviceName, deviceName);
break; break;
case BluetoothDevice.REQUEST_TYPE_SIM_ACCESS:
title = context.getString(R.string.bluetooth_sap_request);
message = context.getString(R.string.bluetooth_sap_acceptance_dialog_text,
deviceName, deviceName);
break;
default: default:
title = context.getString(R.string.bluetooth_connection_permission_request); title = context.getString(R.string.bluetooth_connection_permission_request);
message = context.getString(R.string.bluetooth_connection_dialog_text, message = context.getString(R.string.bluetooth_connection_dialog_text,
@@ -184,6 +189,8 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
return NOTIFICATION_TAG_PBAP; return NOTIFICATION_TAG_PBAP;
} else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) { } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
return NOTIFICATION_TAG_MAP; return NOTIFICATION_TAG_MAP;
} else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
return NOTIFICATION_TAG_SAP;
} }
return null; return null;
} }
@@ -198,7 +205,8 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
// ignore if it is something else than phonebook/message settings it wants us to remember // ignore if it is something else than phonebook/message settings it wants us to remember
if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
&& mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) { && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
&& mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
if (DEBUG) Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType); if (DEBUG) Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
return processed; return processed;
} }
@@ -242,6 +250,20 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
} else { } else {
Log.e(TAG, "Bad messagePermission: " + messagePermission); Log.e(TAG, "Bad messagePermission: " + messagePermission);
} }
} else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
int simPermission = cachedDevice.getSimPermissionChoice();
if (simPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
// Leave 'processed' as false.
} else if (simPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
sendReplyIntentToReceiver(true);
processed = true;
} else if (simPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
sendReplyIntentToReceiver(false);
processed = true;
} else {
Log.e(TAG, "Bad simPermission: " + simPermission);
}
} }
if (DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed); if (DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
return processed; return processed;