Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 75c61d83: Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev

Browse Source 
* commit '75c61d83bffcbbf9b0518cb034e078b640e2095f':
  Add appliance mode handling for WiFi Direct invitation dialog.
This commit is contained in:
Justin Koh
2012-10-19 10:17:13 -07:00
committed by Android Git Automerger
parent 59a9cc18f3 75c61d83bf
commit e2c0feb536
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@@ -30,6 +30,7 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -68,6 +69,7 @@ import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -1917,6 +1919,26 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
break; break;
} }
if ((r.getConfiguration().uiMode & Configuration.UI_MODE_TYPE_APPLIANCE) ==
Configuration.UI_MODE_TYPE_APPLIANCE) {
// For appliance devices, add a key listener which accepts.
dialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
// TODO: make the actual key come from a config value.
if (keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
sendMessage(PEER_CONNECTION_USER_ACCEPT);
dialog.dismiss();
return true;
}
return false;
}
});
// TODO: add timeout for this dialog.
// TODO: update UI in appliance mode to tell user what to do.
}
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.show(); dialog.show();
} }