summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
Commit message (Collapse)AuthorAgeFilesLines
* Make Settings app aware of layout directionFabrice Di Meglio2012-07-241-1/+1
| | | | | | - see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi) Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
* Bring back the Android Beam settings panel.Jeff Hamilton2011-09-222-1/+117
| | | | | Bug: 5350022 Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
* Remove NFC sharing from Settings.Martijn Coenen2011-09-152-152/+1
| | | | | Bug: 5297151 Change-Id: I64304230296912519aa057a89f139a2242b557e3
* Rename {zeroclick, share_tap} -> ndef_push in code.Nick Pelly2011-08-262-21/+21
| | | | | | | | | Not sure what the product name will be, but ndef push seems to be a nice neutral name for the code. Text strings are left as "Share Tap" for now. Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291
* Sharetap settings screen animation and text.Martijn Coenen2011-08-181-3/+25
| | | | Change-Id: Ia19426be5a38a191a2786c1e75c4c5833a7c155f
* Add support for NFC in airplane mode.Nick Pelly2011-08-092-46/+47
| | | | | | Also update logic in Settings for new async NfcAdapter.enable() and disable(). Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
* Fix ActionBar title for NFC sharing.Martijn Coenen2011-08-021-0/+1
| | | | Change-Id: I9d7c479d06437ece3f598506ce1cf2be322b12d0
* Add on/off actionbar switch for NFC Tap To Share.Martijn Coenen2011-07-271-15/+40
| | | | Change-Id: I009a31d8862a23e15d89fe9813eca02e06469531
* Review comments for 0-click setting.Martijn Coenen2011-07-211-3/+1
| | | | Change-Id: I89c84f3a01e7ec15851379b017e3f886138e6611
* Added setting for zero-click sharing over NFC.Martijn Coenen2011-07-212-1/+89
| | | | Change-Id: I3848c4815d65d3a8b9b5e579c6a353dde6901ee4
* Removed summary text and categories in Wireless settingsGilles Debunne2011-07-081-5/+1
| | | | | | Bug 5002377 and 5002476. Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
* Update Settings for new NfcAdapter.getDefaultAdapter(Context)Nick Pelly2010-12-091-1/+1
| | | | Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
* Update settings text on success, so we clear out error text after recovery.Nick Pelly2010-11-031-1/+6
| | | | | Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d Signed-off-by: Nick Pelly <npelly@google.com>
* NFC Settings cleanup.Nick Pelly2010-10-201-4/+3
| | | | | | | | NFC service now tracks its own settings. Call the NFC API to determine state. Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b Signed-off-by: Nick Pelly <npelly@google.com>
* NFC: async enabling/disabling, ala Bluewooth & Wifi.Brad Fitzpatrick2010-10-181-25/+61
| | | | | | | Don't ANR when toggling. Bug: 3097279 Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
* Make summary appear for both checked and unchecked NFC checkbox in Settings.Amith Yamasani2010-10-151-6/+1
| | | | | | | And remove the extra "Tag" in the summary. Bug: 3083079 Change-Id: I998c2556a88180098a060d43b720276a7619a368
* Update NFC settings description, and fix polarity.Nick Pelly2010-10-121-2/+2
| | | | Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
* Update settings app for new NFC API.Nick Pelly2010-10-121-16/+10
| | | | | Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8 Signed-off-by: Nick Pelly <npelly@google.com>
* Add NFC checkbox to Settings app.Nick Pelly2010-09-281-0/+106
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Heavily modified to remove dead code. Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900