diff options
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/topics/connectivity/wifip2p.jd | 22 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-intro.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/layout/gridview.jd | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd index 82c9abd..bbf30fd 100644 --- a/docs/html/guide/topics/connectivity/wifip2p.jd +++ b/docs/html/guide/topics/connectivity/wifip2p.jd @@ -237,16 +237,16 @@ page.title=Wi-Fi Direct */ public class WiFiDirectBroadcastReceiver extends BroadcastReceiver { - private WifiP2pManager manager; - private Channel channel; - private MyWiFiActivity activity; + private WifiP2pManager mManager; + private Channel mChannel; + private MyWiFiActivity mActivity; public WiFiDirectBroadcastReceiver(WifiP2pManager manager, Channel channel, MyWifiActivity activity) { super(); - this.manager = manager; - this.channel = channel; - this.activity = activity; + this.mManager = manager; + this.mChannel = channel; + this.mActivity = activity; } @Override @@ -333,7 +333,7 @@ protected void onCreate(Bundle savedInstanceState){ ... mManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); mChannel = mManager.initialize(this, getMainLooper(), null); - mReceiver = new WiFiDirectBroadcastReceiver(manager, channel, this); + mReceiver = new WiFiDirectBroadcastReceiver(mManager, mChannel, this); ... } </pre> @@ -397,7 +397,7 @@ protected void onPause() { that the discovery process succeeded and does not provide any information about the actual peers that it discovered, if any:</p> <pre> -manager.discoverPeers(channel, new WifiP2pManager.ActionListener() { +mManager.discoverPeers(channel, new WifiP2pManager.ActionListener() { @Override public void onSuccess() { ... @@ -425,8 +425,8 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { // request available peers from the wifi p2p manager. This is an // asynchronous call and the calling activity is notified with a // callback on PeerListListener.onPeersAvailable() - if (manager != null) { - manager.requestPeers(channel, myPeerListListener); + if (mManager != null) { + mManager.requestPeers(mChannel, myPeerListListener); } } </pre> @@ -453,7 +453,7 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { WifiP2pDevice device; WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = device.deviceAddress; -manager.connect(channel, config, new ActionListener() { +mManager.connect(mChannel, config, new ActionListener() { @Override public void onSuccess() { diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index a130f7d..d25a513 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -115,6 +115,7 @@ other mention of the element name. <a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a> <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission /></a> <a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data /></a> + <a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a> <a href="{@docRoot}guide/topics/manifest/provider-element.html"></provider></a> <a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library /></a> diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd index 67bdd0f..84c3dab 100644 --- a/docs/html/guide/topics/ui/layout/gridview.jd +++ b/docs/html/guide/topics/ui/layout/gridview.jd @@ -170,7 +170,7 @@ image is resized and cropped to fit in these dimensions, as appropriate.</li> be cropped toward the center (if necessary).</li> <li>{@link android.widget.ImageView#setPadding(int,int,int,int)} defines the padding for all sides. (Note that, if the images have different aspect-ratios, then less -padding will cause for more cropping of the image if it does not match +padding will cause more cropping of the image if it does not match the dimensions given to the ImageView.)</li> </ul> |