summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
Commit message (Collapse)AuthorAgeFilesLines
* Properly remove NFC payment preferenceMichael Bestas2015-12-121-1/+8
| | | | Change-Id: Id8c9098241e018da37da93b5bd8d9c29307402c0
* Settings: Tap and Pay UI needs to be long clickablePuneet Mishra2015-10-061-1/+25
| | | | | | | | | | NFC payment applications in the Tap and Pay UI need to react to a long click to open the settings menu of the application with a predefined intent. Added longClickListener to NfcPaymentAdapter. Change-Id: If352cf0ae7f819ed3286d5a7c7bb2b7dfc1b0ef7
* Merge "Fix tap & pay strings." into mnc-devMartijn Coenen2015-07-291-10/+3
|\
| * Fix tap & pay strings.Martijn Coenen2015-07-281-10/+3
| | | | | | | | | | | | Bug: 22534220 Bug: 22762332 Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
* | Fix up Tap and Pay how it works.Martijn Coenen2015-07-101-2/+1
|/ | | | | | | | Also, don't use HCE service description. Bug: 21988684 Bug: 21657963 Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
* Merge "Add NFC payment "how it works" screens." into mnc-devMartijn Coenen2015-06-082-2/+34
|\
| * Add NFC payment "how it works" screens.Martijn Coenen2015-06-052-2/+34
| | | | | | | | | | | | | | Bug: 21239081 Bug: 21305138 Bug: 21305420 Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
* | NFC: don't use dynamic resources.Martijn Coenen2015-06-052-53/+7
|/ | | | | | | | | Also fixed talk-back for the default payment app selection. Bug: 21343778 Bug: 21588534 Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
* Help fallbacks and intent workJason Monk2015-05-281-1/+2
| | | | | | | | | | - Handle a backup URI, so that if the specified URI is not available, another can be used. - Add some data to help intents when they are intent URIs - Fill in the context with a classname when it isn't present Bug: 15475009 Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
* New Tap & Pay UX.Martijn Coenen2015-04-285-190/+472
| | | | Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
* Allow help to be defined to intent uriJason Monk2015-04-141-1/+10
| | | | | | | | | Allow help uris to be either an intent uri or as uri (as they were before). Also add a default help uri, and specific helps for several screens. Bug: 15475009 Change-Id: Iff982892973f01d32ff61ea88d4844e9a7153500
* log visibility of viewsChris Wren2015-03-272-1/+14
| | | | | Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
* Fix bug #15730311 Checkboxes on R side should update to Quantum/Material ↵Fabrice Di Meglio2014-10-151-3/+3
| | | | | | | | on/off switch Per UX request, convert more CheckBoxes to Switches Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
* Handle disallowed NFC beam restrictionAmith Yamasani2014-09-092-4/+18
| | | | | | | | Don't enable the beam setting and toggle if it is disallowed for the current user. Bug: 17387303 Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
* Update NFC to use a SwitchPreferenceFabrice Di Meglio2014-08-151-16/+16
| | | | | | | | - do the switch See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
* Prevent newlines and long captions selecting default payment appAndres Morales2014-08-071-3/+17
| | | | | | | | | This would allow attackers to spoof the default selection dialog causing the user to unkowingly change their default payment handler. Bug: 15906632 Change-Id: I49ad2a7351bd6d2c1f9a79ad9be0cbc9787ca6c3
* Make the SwitchBar appear immediatelyFabrice Di Meglio2014-06-121-20/+6
| | | | | | | | - change the way the SwitchBar is shown and hidden - save its state - remove the delay transition code Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
* Fix bug #15173703 Crash in Settings is observed when Android Beam page ↵Fabrice Di Meglio2014-05-231-10/+28
| | | | | | | | | orientation is changed. DO NOT MERGE - use onActivityCreated() / onResume() / onPause() for the SwitchBar Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d (cherry picked from commit 4c42a88828a8df9e00ce66216fe0ef9f0d89464d)
* HCE foreground support.Martijn Coenen2014-05-163-14/+40
| | | | | | Allow users to configure they want to favor the foreground app for tap&pay. Change-Id: I25e1058e84f468e47fd40f43b65389c04373a3ab
* Use SwitchBar for Android Beam SettingsFabrice Di Meglio2014-05-151-35/+22
| | | | | | | | - follow up CL to 41937766981423c9252e12e3319b2e7532739627 Related to bug #14898161 On/Off switches must move down from Action Bar Change-Id: I2e3ffb34a589b32deda9de19107f38041aa341c9
* Make all the Settings Switches appear againFabrice Di Meglio2014-04-181-1/+1
| | | | | | | - use the ActionBar Theme context when creating the Switch for getting the correct Theming Change-Id: Ic3701c53662b0f245c7149b119de8bb5cbaae232
* Use Drawer in Settings appFabrice Di Meglio2014-02-031-4/+2
| | | | | | | | | | | | | | | | | | | | - get rid of PreferenceActivity as much as we can and use fragments instead - add Drawer widget - add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL) - add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external call thru an Intent Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we would have two Home). Also, verified that: - the WiFi settings still work when called from SetupWizard - when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
* Remove Google Play specific search URIs from Settings.Svetoslav2013-09-301-4/+8
| | | | | | | | | | | | | 1. If there are no installed print services or NFC payment services, we would like to allow the user to search for one in Play. However, Play is Google specific and we should not have hard coded URI that rely on it in settings. Declare secure settings for each of these URI and check at runtime if the URI is non-empty, then show the add menu item. bug:11011519 Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
* Tap & pay: change empty state UX and strings.Martijn Coenen2013-09-271-3/+26
| | | | | Bug: 10965661 Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
* Latest UX for Tap & pay.Martijn Coenen2013-09-253-31/+79
| | | | | Bug: 10862185 Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
* HCE: Latest UX and strings.Martijn Coenen2013-09-113-9/+46
| | | | | Bug: 10262585 Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
* NFC Tap&Pay: deal with changes from API review.Martijn Coenen2013-08-303-23/+8
| | | | | | | Also, removed "Ask every time" mode. Bug: 10550349 Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
* Update NFC payments to match new framework APIs.Martijn Coenen2013-08-283-22/+2
| | | | | Bug: 10262585 Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
* NFC: Allow to get result from tap-pay default dialog.Martijn Coenen2013-08-141-0/+2
| | | | Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
* NFC payment settings.Martijn Coenen2013-08-063-0/+372
| | | | | | First version, pending final UX. Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
* Fix Android Beam toggle switch on Manta.Martijn Coenen2013-02-261-15/+21
| | | | | Bug: 7974617 Change-Id: I9200c070a13415b5c0ca545211a31b3e9c544cac
* Fix Switches padding for Settings appFabrice Di Meglio2013-01-151-1/+1
| | | | | | - use setPaddingRelative() instead of setPadding() Change-Id: Ifd14193a5f60d303035b394616dc65a70e1ef5f9
* 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>
generated by cgit v1.1 at 2024-05-30 17:19:19 +0000