| 25a1e95ed607a8517694df4dccfccdff00b0f082 |
|
09-Sep-2014 |
Amith Yamasani <yamasani@google.com> |
Handle disallowed NFC beam restriction
Don't enable the beam setting and toggle if it is disallowed for
the current user.
Bug: 17387303
Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 4325f8080888bd3b15246f5bbd9db878aced030c |
|
15-Aug-2014 |
Fabrice Di Meglio <fdimeglio@google.com> |
Update NFC to use a SwitchPreference
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 3d670de5ce9180e0a75d0884832c4714cb56e1b5 |
|
21-Sep-2011 |
Jeff Hamilton <jham@android.com> |
Bring back the Android Beam settings panel.
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 943af0bc69048d827c3dd1b92daeaa2cf1b77145 |
|
14-Sep-2011 |
Martijn Coenen <maco@google.com> |
Remove NFC sharing from Settings.
Bug: 5297151
Change-Id: I64304230296912519aa057a89f139a2242b557e3
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 0fb33abfb468f495b3223e08b3920aab86bea696 |
|
24-Aug-2011 |
Nick Pelly <npelly@google.com> |
Rename {zeroclick, share_tap} -> ndef_push in code.
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
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 9894d4ade475392f665bf87bf7f91d3cbed3eaa4 |
|
09-Aug-2011 |
Nick Pelly <npelly@google.com> |
Add support for NFC in airplane mode.
Also update logic in Settings for new async NfcAdapter.enable() and disable().
Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| ba534408011905e657a143eeae9a4c0fa412e0ec |
|
21-Jul-2011 |
Martijn Coenen <maco@google.com> |
Added setting for zero-click sharing over NFC.
Change-Id: I3848c4815d65d3a8b9b5e579c6a353dde6901ee4
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| dfc2637ebaee6e7467b0340ec652c29f6b5734ff |
|
08-Jul-2011 |
Gilles Debunne <debunne@google.com> |
Removed summary text and categories in Wireless settings
Bug 5002377 and 5002476.
Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 267419ff8b6a0458c098a1787e11df2bc9ddb38a |
|
10-Dec-2010 |
Nick Pelly <npelly@google.com> |
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 91ba0709b032d0c80ca086f53552f251a21c6df4 |
|
04-Nov-2010 |
Nick Pelly <npelly@google.com> |
Update settings text on success, so we clear out error text after recovery.
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| e16f78d54abb7b8aad43bfa12328c1515a6e08e6 |
|
21-Oct-2010 |
Nick Pelly <npelly@google.com> |
NFC Settings cleanup.
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>
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| d36d650a8132e8aea375239e6dfff92708771b7a |
|
18-Oct-2010 |
Brad Fitzpatrick <bradfitz@android.com> |
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 1bdb7874adf52b0fc2fe6ec40913a0562cf585ed |
|
15-Oct-2010 |
Amith Yamasani <yamasani@google.com> |
Make summary appear for both checked and unchecked NFC checkbox in Settings.
And remove the extra "Tag" in the summary.
Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 083310d316059c6592120c32e1c0b736e85b83c0 |
|
13-Oct-2010 |
Nick Pelly <npelly@google.com> |
Update NFC settings description, and fix polarity.
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| 454d2ef0510eb953b5060eb84239682e3ec302be |
|
12-Oct-2010 |
Nick Pelly <npelly@google.com> |
Update settings app for new NFC API.
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|
| ad50ba065d31f3d8ec53c512b6ba5cf94d15d1e3 |
|
22-Sep-2010 |
Nick Pelly <npelly@google.com> |
Add NFC checkbox to Settings app.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
/packages/apps/Settings/src/com/android/settings/nfc/NfcEnabler.java
|