| 2ea67003364d8f4a79d6afd624d56709839151ee |
|
12-Jul-2017 |
Fan Zhang <zhfan@google.com> |
Show default app icon in default app screen.
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
title (no icon because we can't get it)
Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix: 36458534
Test: robotests
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| ea5e18c8090601cc0ef6bd1a8304638f8d03d8cd |
|
06-Jun-2017 |
Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> |
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59 am: 77452b8a57
am: a1f5332068
Change-Id: If7351ccb7896cc1cfeb83837b09650a50ed1b55a
|
| a1f533206811bf0f97e4bff59584de3bd69bfce8 |
|
06-Jun-2017 |
Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> |
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59
am: 77452b8a57
Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
|
| a322f6eab3a98cff62882adc6468860ca68113f6 |
|
06-Jun-2017 |
Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> |
NFC: Reset Tap&pay summary text if default payment is not set
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.
Test: manual
Bug: 62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 82be5f0c3fa4b9511e1e7e4c4e9c20cf31a8294f |
|
23-May-2017 |
Fan Zhang <zhfan@google.com> |
Misc fixes to search and UI.
- Use prefContext to create preference.
- rename "Gestures" to "Gesture shortcuts"
- Add search keyword to individual gesture settings so when search
"gesture" they also show up.
- call super() for all getNonIndexableKeys() in search provider
Fix: 38327387
Fix: 36621897
Fix: 36685646
Test: make RunSettingsRoboTests
Change-Id: Ia5ddfeae08cb27c278dfb8d2376594e21d8f283c
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 7e0df1e48c6a6555a791d32073062357ac0007d9 |
|
23-Feb-2017 |
Andre Eisenbach <eisenbach@google.com> |
Add key to NFC search index option
Bug: 35657617
Test: manual
Change-Id: If9350272f7e48b061dea2f0da75c3c5bcd0ee9ac
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 4d03c5b48980faba7eff60267696da346f595714 |
|
23-Feb-2017 |
Andre Eisenbach <eisenbach@google.com> |
Do not index NFC for search if NFC is not present
Bug: 35657617
Test: manual
Change-Id: I320b46d4d384611725d2dea628cf42180b8018ac
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 5a638a6ad159dd489de3da1089327f71e2138911 |
|
18-Jan-2017 |
Tamas Berghammer <tberghammer@google.com> |
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit fbd5f5fdce07a6d77dd2c3309c7272bf33414396.
Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| fbd5f5fdce07a6d77dd2c3309c7272bf33414396 |
|
22-Jun-2016 |
Tamas Berghammer <tberghammer@google.com> |
Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 265d3c2a0c36251bf8a9f571d7239b6dd404d942)
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 4302dfa853a962c3bb4898c568a62a2834998056 |
|
03-Jan-2017 |
Ruchi Kandoi <kandoiruchi@google.com> |
nfc: Make tap & pay searchable
Bug: 26818511
Test: make RunSettingsRoboTests -j40; no regression
Change-Id: I2e79fcac984510cb444fcaf0cca8f64f9822c047
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 265d3c2a0c36251bf8a9f571d7239b6dd404d942 |
|
22-Jun-2016 |
Tamas Berghammer <tberghammer@google.com> |
Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 6507613ebcd22e4691c2af92a5c161bd327db336 |
|
08-Aug-2016 |
Fan Zhang <zhfan@google.com> |
Log visibility change for all fragments.
Bug: 30681771
Test: SettingsUnitTests
Refactor visibility logging from InstrumentedFragment into a mixin. And
apply mixin in remaining fragments.
Change-Id: Ibbb59904336254a3e4bb9e8c7d0b36e5a6bc2622
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 9d1bfd1e8de6e46137a9571507c03526880d6a46 |
|
27-Jan-2016 |
Chris Wren <cwren@android.com> |
port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 77d57d07a97b60633d2fe76acc11a845c0850674 |
|
16-Dec-2015 |
Jason Monk <jmonk@google.com> |
Protect against crash when no NfcAdapter is around
Bug: 26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 91487434c03591896de97f3c9e281cda336689cc |
|
03-Dec-2015 |
Jason Monk <jmonk@google.com> |
Guard against no payment app
Bug: 25990521
Change-Id: I3307fb197d1a38ff759628bf72f6b7e4afcb8001
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 9d80eeabe7807b5ff0a60bd40d3a1a84f681ea37 |
|
20-Nov-2015 |
Jason Monk <jmonk@google.com> |
Add some more summaries for Settings Home
Change-Id: Iaca8db6bdce87e667832b5b670e4eb027580b668
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 2fe90293a16352c119acd6014ad0b9583896cd5e |
|
10-Nov-2015 |
Jason Monk <jmonk@google.com> |
Various small crash fixes and guards
Bug: 25501551
Bug: 25583654
Bug: 25510495
Bug: 23575961
Change-Id: Id0e7f6aacdf763bf95b49d281aa8755afcd2e5ef
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 39b467482d1bf256a111c757e9b7621c6f523271 |
|
10-Sep-2015 |
Jason Monk <jmonk@google.com> |
Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| cbcc76e8d32f95690d08258a91d58136cd9fb056 |
|
05-Jun-2015 |
Martijn Coenen <maco@google.com> |
Add NFC payment "how it works" screens.
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| fe58b534f6a1bf63dadb18dae13c59ed8a014eec |
|
21-Apr-2015 |
Martijn Coenen <maco@google.com> |
New Tap & Pay UX.
Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 8a963babe2e36b7a41f77b8d2598c97658196e58 |
|
20-Mar-2015 |
Chris Wren <cwren@android.com> |
log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| daef2e2b066a0bf204b9a63b7cae13e3d5441f4e |
|
16-Oct-2014 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert more CheckBoxes to Switches
Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 00dbb74b8d699510ece683fc7ab12fc2343fa5d5 |
|
26-Apr-2014 |
Martijn Coenen <maco@google.com> |
HCE foreground support.
Allow users to configure they want to favor the foreground
app for tap&pay.
Change-Id: I25e1058e84f468e47fd40f43b65389c04373a3ab
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 5c3052936883038d25b2afe52c2dd023e9aa6812 |
|
01-Oct-2013 |
Svetoslav <svetoslavganov@google.com> |
Remove Google Play specific search URIs from Settings.
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
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| b412e18296cf3958585efdaec15c8b9d28bd2c50 |
|
27-Sep-2013 |
Martijn Coenen <maco@google.com> |
Tap & pay: change empty state UX and strings.
Bug: 10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 0e940d6c00d06578c4c0f89a95e5d31c8073fbc1 |
|
25-Sep-2013 |
Martijn Coenen <maco@google.com> |
Latest UX for Tap & pay.
Bug: 10862185
Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| da6c0ba382c1c2c9b98f11a1ef9e572472654e27 |
|
06-Sep-2013 |
Martijn Coenen <maco@google.com> |
HCE: Latest UX and strings.
Bug: 10262585
Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| a73aa32278adb177042d4b5c873a0f08deb1d3f3 |
|
30-Aug-2013 |
Martijn Coenen <maco@google.com> |
NFC Tap&Pay: deal with changes from API review.
Also, removed "Ask every time" mode.
Bug: 10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 573a21ada2729346f53acdd2418a77d6911a7374 |
|
29-Aug-2013 |
Martijn Coenen <maco@google.com> |
Update NFC payments to match new framework APIs.
Bug: 10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|
| 26515da08707b6f8182cc8b0ed5e01e97aa92a96 |
|
02-Aug-2013 |
Martijn Coenen <maco@google.com> |
NFC payment settings.
First version, pending final UX.
Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
/packages/apps/Settings/src/com/android/settings/nfc/PaymentSettings.java
|