Commit Graph

17936 Commits

Author SHA1 Message Date
Doris Ling
d5d4ae7348 Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev am: c074c1c8fe
am: da9d206916

Change-Id: Ia2d3416b079c617450562eb0daf3ab3625b83d0f
2017-06-28 01:50:20 +00:00
Doris Ling
da9d206916 Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
am: c074c1c8fe

Change-Id: Ibe3d07e72916fd45c1959e4dc194040b5bed3d17
2017-06-28 01:46:48 +00:00
TreeHugger Robot
c074c1c8fe Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev 2017-06-28 01:41:34 +00:00
Fan Zhang
8e1a32f3d0 Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev am: a2c3828ede
am: b4e6874088

Change-Id: Ic2bf3841057347cd3a2556e53c5a5613135d9f4c
2017-06-28 00:38:30 +00:00
Kevin Chyn
81031d2467 Assist gesture settings should reflect assistant eligibility/preferences am: 1b44a87987
am: cdcceec0fb

Change-Id: Ia5a061381db8d5e36ce1d31ac89ee2c58af27989
2017-06-28 00:35:32 +00:00
Fan Zhang
b4e6874088 Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev
am: a2c3828ede

Change-Id: I169e01d0fbcbe5fa85710daec366e6025e890098
2017-06-28 00:31:42 +00:00
Kevin Chyn
cdcceec0fb Assist gesture settings should reflect assistant eligibility/preferences
am: 1b44a87987

Change-Id: Ifebce52e57590839770e2ea46eadb9e99abe5673
2017-06-28 00:29:36 +00:00
TreeHugger Robot
a2c3828ede Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev 2017-06-28 00:29:00 +00:00
TreeHugger Robot
c7eee5fcee Merge "Update string id to make it more generic" 2017-06-27 23:06:43 +00:00
Kevin Chyn
1b44a87987 Assist gesture settings should reflect assistant eligibility/preferences
Fixes: 37707753
Fixes: 62843146

Test: manual testing of settings && make -j RunSettingsRoboTests
Change-Id: I5e606686a03960e5cfe1df2f77c48d6ece9c363a
2017-06-27 15:08:33 -07:00
Doris Ling
8233ab5fe5 Fix crash when initializing Settings suggestions.
The dashboard spacer has been removed, but the remaining indexing is not
modified correspondingly, which results in mismatched dashboard types.
Set the dashboard header position back to 0.

Change-Id: I732c4ada556d5d4325e357b8325f66ded5cbe952
Fix: 63052534
Test: make RunSettingsRoboTests
2017-06-27 14:26:03 -07:00
Fan Zhang
cf38863a6b Update string id to make it more generic
Test: builds
Bug: 62354743
Change-Id: I321f5e3d7560dbc21d52dbaa8ebe2df07f99a3db
2017-06-27 14:24:47 -07:00
TreeHugger Robot
c343993be3 Merge "Improve delete fingerprint UI." 2017-06-27 20:27:49 +00:00
Fan Zhang
fbcf4e6e14 Trim search query when initializing installed app searcher.
Change-Id: I502185d4b497b2edac32e4a8368be76d13b68259
Fix: 62885439
Test: make RunSettingsRoboTests
2017-06-27 19:48:54 +00:00
TreeHugger Robot
ce319da841 Merge "Reduce jank around loading view when opening data usage UI" 2017-06-27 19:08:10 +00:00
Andrew Sapperstein
dd1dc22dcc Merge "Search results page polish" into oc-dr1-dev am: 692a4b5514
am: a35b49a17d

Change-Id: I74370bad4f49ad1e9464e377057b5aebc74696aa
2017-06-27 18:59:35 +00:00
Maurice Lam
1dfd5b8f49 Merge "Rename buttons in lock screen setup" into oc-dr1-dev am: fbfca43e6e
am: 57e61ba4f3

Change-Id: Id070948b2fb600509c0b62f02d4189b4c00c504e
2017-06-27 18:55:20 +00:00
Maurice Lam
02a370653c Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev am: 624212f43c
am: a3eb263479

Change-Id: Ibe7045461c17aaf3b761f746bac2a596b9e7e2a0
2017-06-27 18:54:33 +00:00
Maurice Lam
e765be44d6 Merge "Update buttons in FP find sensor" into oc-dr1-dev am: a102714c19
am: 2cc641940d

Change-Id: If6155441bff70cd30160619cdd5a61d6fe562cec
2017-06-27 18:53:48 +00:00
jackqdyulei
6b7ff12008 Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339
am: e9d1f6f1ae

Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a
2017-06-27 18:46:14 +00:00
TreeHugger Robot
2f09c9e4c8 Merge "resolve merge conflicts of 758b2d4ae6 to master" 2017-06-27 18:39:34 +00:00
Fan Zhang
8a1fd388fd Improve delete fingerprint UI.
- Make fingerprint preference use two_target preference
- And add a delete button as secondary target
- Remove delete fingerint code from RenameDeleteDialog, and move to new
  DeleteFingerprintDialog
- Some code cleanup
- Tests

Change-Id: I49d9c7d1d03497f07c7e20a805f23e6da934f587
Fix: 37783186
Test: make RunSettingsRoboTests
2017-06-27 11:33:23 -07:00
Andrew Sapperstein
a35b49a17d Merge "Search results page polish" into oc-dr1-dev
am: 692a4b5514

Change-Id: I9953971cfaa2c78b2be9fbd027f7cdb029bbb9c1
2017-06-27 17:02:58 +00:00
TreeHugger Robot
692a4b5514 Merge "Search results page polish" into oc-dr1-dev 2017-06-27 16:53:54 +00:00
TreeHugger Robot
326c91c8b5 Merge "Show IMSI in RadioInfo." 2017-06-27 16:23:38 +00:00
Phil Weaver
928045e5d5 Merge "Adjust a11y shortcut settings based on UX input" 2017-06-27 15:09:35 +00:00
Kevin Chyn
b26ac1f381 Merge "Fix assist gesture settings summary" into oc-dr1-dev
am: 63e36128e6

Change-Id: I05d1d9129892ebf1049f771ebc2404bafee4d60a
2017-06-27 03:34:30 +00:00
TreeHugger Robot
63e36128e6 Merge "Fix assist gesture settings summary" into oc-dr1-dev 2017-06-27 03:28:43 +00:00
Andrew Sapperstein
f4b40fa221 Merge "Dashboard search bar polish" into oc-dr1-dev
am: 3b7ed7ae65

Change-Id: I85a67a54a79123db510cebdbc04e06cb6dfb420e
2017-06-27 02:35:15 +00:00
TreeHugger Robot
3b7ed7ae65 Merge "Dashboard search bar polish" into oc-dr1-dev 2017-06-27 02:28:26 +00:00
jackqdyulei
8ce27bc37c resolve merge conflicts of 758b2d4ae6 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53
2017-06-26 18:30:40 -07:00
TreeHugger Robot
58005fc5c1 Merge "Fix assist gesture settings summary" 2017-06-27 01:22:17 +00:00
Maurice Lam
57e61ba4f3 Merge "Rename buttons in lock screen setup" into oc-dr1-dev
am: fbfca43e6e

Change-Id: Ia7de9aba909a00bb2bf9acd01d897fcedcdfb4c2
2017-06-27 01:17:25 +00:00
Maurice Lam
a3eb263479 Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
am: 624212f43c

Change-Id: I90b4d7d57a7dc3bca86f46b34b0f9af2b78ea574
2017-06-27 01:16:46 +00:00
Maurice Lam
2cc641940d Merge "Update buttons in FP find sensor" into oc-dr1-dev
am: a102714c19

Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b
2017-06-27 01:16:16 +00:00
Maurice Lam
fbfca43e6e Merge "Rename buttons in lock screen setup" into oc-dr1-dev 2017-06-27 01:10:49 +00:00
Maurice Lam
624212f43c Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev 2017-06-27 01:10:23 +00:00
Maurice Lam
a102714c19 Merge "Update buttons in FP find sensor" into oc-dr1-dev 2017-06-27 01:10:10 +00:00
Kevin Chyn
57c7294e57 Merge "Remove unnecessary functions from AssistGestureFeatureProvider" 2017-06-27 00:45:31 +00:00
Andrew Sapperstein
ab0c049bc2 Search results page polish
Changes made:
- up button added and in correct place
- text color correct when entering query
- query text aligned with results
- grey background around searchbar

Fixes: 37477506
Test: robotests
Change-Id: Ieb135f81f684032f3d5e4102304e617088c88117
2017-06-26 17:19:53 -07:00
TreeHugger Robot
60b71f53e3 Merge "resolve merge conflicts of 31a2f413f8 to master" 2017-06-27 00:14:14 +00:00
TreeHugger Robot
4c1a871216 Merge "Dashboard search bar polish" 2017-06-27 00:11:59 +00:00
Kevin Chyn
59f901861b Remove unnecessary functions from AssistGestureFeatureProvider
Fixes: 62945918

Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-26 16:58:43 -07:00
Fan Zhang
896f1b363c Reduce jank around loading view when opening data usage UI
Change-Id: I3d23d8160b046de8fe125ba0697b7b3d7786453c
Fix: 28181319
Test: robotests
2017-06-26 15:15:30 -07:00
daqi
ba3c8edc2f resolve merge conflicts of 31a2f413f8 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
2017-06-26 15:04:15 -07:00
Andrew Sapperstein
c0d544943f Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e
2017-06-26 14:28:10 -07:00
TreeHugger Robot
c26ae0677e Merge "Fix typo in metrics constants" 2017-06-26 21:06:48 +00:00
Kevin Chyn
891ab1a713 Fix assist gesture settings summary
Bug: 62841640

Test: make -j RunSettingsRoboTests && manual testing of settings

Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
2017-06-26 13:36:02 -07:00
Kevin Chyn
4efa54e342 Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
am: 0e393d4163

Change-Id: I3bc791c4d31d78de761eda608c26450d9940f11d
2017-06-26 20:30:56 +00:00
jackqdyulei
e9d1f6f1ae Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
am: 1eb2f15339

Change-Id: I9a1e1f78b34e989a1e56a0e43bf2f40df10a35eb
2017-06-26 20:30:26 +00:00