Commit Graph

19095 Commits

Author SHA1 Message Date
Salvador Martinez
ce524945c1 Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am: 7f87347eb9 am: 8e15db0ec9
am: 3d869b6324

Change-Id: I58c7630fe92360cf1c68f6716657b2dac5e59b76
2017-07-27 22:51:15 +00:00
Salvador Martinez
3d869b6324 Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am: 7f87347eb9
am: 8e15db0ec9

Change-Id: Iddec3a43f12242f030f32bb42505c908bf3c7ce4
2017-07-27 22:31:42 +00:00
Salvador Martinez
3bca521f3a Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
am: 7f87347eb9

Change-Id: I0f300734820634009197c7b9ca85e3973d87a0cb
2017-07-27 22:26:58 +00:00
Salvador Martinez
8e15db0ec9 Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
am: 7f87347eb9

Change-Id: I286ed310140f522c67fa4c3c6af539938a66207d
2017-07-27 22:24:27 +00:00
TreeHugger Robot
7f87347eb9 Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev 2017-07-27 22:16:48 +00:00
Ajay Nadathur
d48d323e13 Remove extra steps in fingerprint flow
bug: 63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
(cherry picked from commit e24f1ab745)
2017-07-27 21:57:55 +00:00
Ajay Nadathur
70927d2bd7 Merge "Remove extra steps in fingerprint flow" 2017-07-27 21:57:12 +00:00
Doris Ling
98b39af411 Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev am: 1f34a5cf46
am: a374e1062c

Change-Id: I7773754b0f262f2256735de3d98cc4e64d9f7be6
2017-07-27 21:26:31 +00:00
Doris Ling
a374e1062c Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
am: 1f34a5cf46

Change-Id: I165b63605b7a55ea0b64c56f87a7ace291a44a28
2017-07-27 21:21:01 +00:00
TreeHugger Robot
1f34a5cf46 Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev 2017-07-27 21:14:43 +00:00
Daniel Nishi
c0659ea40d Make nfc toggability logic static and public.
Test: exercised in other robotests
Change-Id: Id51c9fd820afd539c1d647feb90eecf73ffbf4a7
2017-07-27 13:06:33 -07:00
Doris Ling
2798c24deb Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Change-Id: I3bbc08bb67c411ff5671a837efa40da0ac885983
Merged-In: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 64072051
Test: make RunSettingsRoboTests
2017-07-27 12:50:47 -07:00
Ajay Nadathur
e24f1ab745 Remove extra steps in fingerprint flow
bug: 63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
2017-07-27 12:11:30 -07:00
Jian Zhou
3521974b8a Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0 am: 86535a3d15 am: 62bb1e75ac
am: 8071e11d87

Change-Id: I60ffd8a6328b64952176c91922411000e86a9d31
2017-07-27 18:45:20 +00:00
Ryusuke Sawa
f26d2ced82 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49 am: 775c1c8eb5
am: 653ef15253

Change-Id: I4b48899bd33466742cbe3bf93d9b5fe01d4472ea
2017-07-27 18:44:55 +00:00
jackqdyulei
66b633b71d Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a am: 16afa828c7
am: 9b6a6e903d

Change-Id: I7705b7a64bfd8487d9e2d00ad1eba293ec8f096a
2017-07-27 18:44:26 +00:00
Salvador Martinez
d67f9a17ed Change visibility of some UsbBackend fields/methods
Some utility methods in UsbBackend were needed elsewhere so this CL
increases their visibility slightly rather than copying the code.

Test: Robotests still pass
Bug: 62271803
Change-Id: If8ac5494e306ac7f4f6d8eeef75f516308c78026
2017-07-27 11:35:19 -07:00
Jian Zhou
8071e11d87 Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0 am: 86535a3d15
am: 62bb1e75ac

Change-Id: I9dc6da68107514e839b4284a4aeab47f43f745e6
2017-07-27 18:29:03 +00:00
Ryusuke Sawa
653ef15253 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49
am: 775c1c8eb5

Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
2017-07-27 18:28:17 +00:00
Jian Zhou
62bb1e75ac Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0
am: 86535a3d15

Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
2017-07-27 18:26:35 +00:00
jackqdyulei
9b6a6e903d Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a
am: 16afa828c7

Change-Id: I16bcd80c82ed42f65b1490f1f8189e5e55844688
2017-07-27 18:26:24 +00:00
Ryusuke Sawa
775c1c8eb5 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
2017-07-27 18:26:18 +00:00
Jian Zhou
3aee5e1ad0 Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
2017-07-27 18:22:21 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
jackqdyulei
8541d8905a Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I3a814981c648d9b777d2fbf5a2d243864aaaee3c
2017-07-27 18:21:16 +00:00
jackqdyulei
16afa828c7 Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
2017-07-27 18:21:16 +00:00
Treehugger Robot
41b4d908bb Merge "Settings: Fix SparseArray null pointer issue in monkey issues" 2017-07-27 18:16:08 +00:00
TreeHugger Robot
4ab4966e7a Merge "Don't update the header when toggle menu" into oc-dr1-dev 2017-07-27 18:15:55 +00:00
Soroosh Mariooryad
30b6b769c3 Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp
am: 9c08a6cb1b

Change-Id: Ie975d26e4624a504f94ee2b633479e648012cbc9
2017-07-27 18:15:27 +00:00
jackqdyulei
d544a5b663 Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev am: ea7c30265c
am: 339c6ac7c2

Change-Id: I79b0f0eb4032260b73e8b4fe3ec4f741dbeb2e1e
2017-07-27 18:15:02 +00:00
Doris Ling
d53a3128e8 Fix null pointer exception when updating action bar shadow.
Check for valid activity when trying to access the action bar as the
activity can become null when in monkey test.

Change-Id: I684d873b9eabb9d8461e99bb4385d411a48c0c52
Fix: 64084651
Test: make RunSettingsRoboTests
2017-07-27 11:14:44 -07:00
Android Build Merger (Role)
9c08a6cb1b Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp 2017-07-27 17:57:03 +00:00
Soroosh Mariooryad
ae5aa96311 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0
am: e993ab19fc

Change-Id: I5903157a27f97ac1d8f429978b400d7f22428f28
2017-07-27 17:56:43 +00:00
Soroosh Mariooryad
6f0e9273f8 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Ia59839d3b952420390896d06c030905853df92e7
2017-07-27 17:54:48 +00:00
Soroosh Mariooryad
e993ab19fc Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Iad0b750eaaee29a41be6514cc29d521bc899b71a
2017-07-27 17:54:46 +00:00
TreeHugger Robot
ea7c30265c Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev 2017-07-27 17:53:54 +00:00
Doris Ling
4940539479 Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Bug: 64072051
Change-Id: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 63309218
Test: make RunSettingsRoboTests
2017-07-27 10:45:30 -07:00
Soroosh Mariooryad
a861d11027 Update suggestion ranking model coefficients.
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.

Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782

Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
2017-07-27 00:38:42 -07:00
Andrew Sapperstein
3b30cbee7d Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d

Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
2017-07-27 05:41:58 +00:00
TreeHugger Robot
3bd56d970d Merge "Add ambient notifications as inline setting." into oc-dr1-dev 2017-07-27 05:37:49 +00:00
Matthew Fritze
9deb3f3c54 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 68617a6f42
am: cba96eb672

Change-Id: I0f6a9f3923c36553d4494a0fca00024abffb96e5
2017-07-27 05:29:20 +00:00
Doris Ling
409091c5c9 Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am: 8e13218ec8
am: e866cd4825

Change-Id: If482eb0f2229193145e2157ae76d09249e0c433b
2017-07-27 05:28:52 +00:00
Andrew Sapperstein
151fb83ea6 Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
am: 8f25bc916a

Change-Id: Icdbd94d006b5c7bcc0251d657342ee6c90f7ef48
2017-07-27 05:27:57 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Matthew Fritze
68617a6f42 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
2017-07-27 01:20:02 +00:00
Matthew Fritze
9092e1a0b0 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
2017-07-27 01:09:55 +00:00
Jeff Davidson
a0b8472c4d Remove eSIM reset checkbox and always perform the reset.
Due to substantial risk in landing the "retain profiles" flow that
would otherwise occur if the user elected not to wipe eSIM profiles
during a factory reset, we no longer expose this option to users
through the UI. Instead, we show affected users messaging indicating
that their eSIM will be wiped unconditionally.

The underlying plumbing is retained to keep the change small and to
make it easier to revert back to a checkbox when the rest of the
platform supports it.

Change-Id: Ida7df14d81ffc4cb6b4b414928d3ce7e5c78594b
Fixes: 64081853
Test: TreeHugger
2017-07-27 01:05:02 +00:00
jackqdyulei
aa5618fd82 Add ResultPayload for Allow notification dots
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
TreeHugger Robot
8e13218ec8 Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev 2017-07-27 00:50:10 +00:00
TreeHugger Robot
c2cb0d0b9e Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev 2017-07-27 00:31:13 +00:00