Commit Graph

37484 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
Bill Yi
c5c7ad875c Import translations. DO NOT MERGE am: 8e132ce53c -s ours am: 38b7d50a49 -s ours
am: 47ff496407  -s ours

Change-Id: I26b4e5178beb47f231e73889675f36bd2340d9e9
2017-06-27 20:30:30 +00:00
TreeHugger Robot
c343993be3 Merge "Improve delete fingerprint UI." 2017-06-27 20:27:49 +00:00
Bill Yi
47ff496407 Import translations. DO NOT MERGE am: 8e132ce53c -s ours
am: 38b7d50a49  -s ours

Change-Id: I9f2d7d683482701ef2a26cf2d03be8bdba8fa079
2017-06-27 20:21:25 +00:00
Bill Yi
1a14eb22db Import translations. DO NOT MERGE am: 8e132ce53c -s ours am: 7c952faa77 -s ours
am: 3c2a60e813  -s ours

Change-Id: Ifa974eb7ed6d61b78e2aac66c027b40920948e03
2017-06-27 20:20:00 +00:00
Bill Yi
5270ca6e25 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 98bbb157a9 -s ours
am: 4b7bc479da  -s ours

Change-Id: I22490d0da5e44774b6d2b5015bbf6f6e9e02ba5b
2017-06-27 20:19:36 +00:00
Bill Yi
3c2a60e813 Import translations. DO NOT MERGE am: 8e132ce53c -s ours
am: 7c952faa77  -s ours

Change-Id: Ib5bf7b801f9c5df19fd8c7ae070f4fe760356a3f
2017-06-27 20:15:40 +00:00
Bill Yi
7c952faa77 Import translations. DO NOT MERGE
am: 8e132ce53c  -s ours

Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac
2017-06-27 20:08:19 +00:00
Bill Yi
4b7bc479da Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 98bbb157a9  -s ours

Change-Id: I65f40eb6eacfc157266ce57420bc9a1b6f508a6d
2017-06-27 20:06:53 +00:00
Bill Yi
38b7d50a49 Import translations. DO NOT MERGE
am: 8e132ce53c  -s ours

Change-Id: I1546d616bc8d0344d9538cdb0c5fb80b3454105a
2017-06-27 20:06:52 +00:00
TreeHugger Robot
98bbb157a9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-27 19:52:24 +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
Sean Stout
83d8ac94db Merge "Add Night Light to Settings widget" into oc-dr1-dev am: 2b0ea1c710
am: d695f232d5

Change-Id: I7275813e73a9eaf613ce74fc58bd2e89397514fd
2017-06-27 19:18:59 +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
Kevin Chyn
9bf587bdf5 Merge "Fix assist gesture settings summary" into oc-dr1-dev am: 63e36128e6
am: b26ac1f381  -s ours

Change-Id: If31e74e8064eb38e2d0894e8c0d4a963aafe4596
2017-06-27 18:56:15 +00:00
Andrew Sapperstein
f401c9e741 Merge "Dashboard search bar polish" into oc-dr1-dev am: 3b7ed7ae65
am: f4b40fa221  -s ours

Change-Id: Ib613926dfb92e20bb79d2237cdc898166665223f
2017-06-27 18:55:50 +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
d059e293fa Merge "Update skip button label to "Do it later"" into oc-dr1-dev am: b97f91c971
am: 467f39d243

Change-Id: Ibcb63391115160778939577fd7d34f6b84a77b49
2017-06-27 18:54:57 +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
Fan Zhang
c144c9c380 Merge "Update icon for language settings" into oc-dr1-dev am: 124232d6fa
am: 6175c9cc6a

Change-Id: I46a0308bf9d3a7aa8397d337e99bc4a09eae2f00
2017-06-27 18:53:25 +00:00
daqi
3251bb4a42 Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours am: 34fe9136c6 am: 96e566a68c
am: 49729cbd9e

Change-Id: I4805dd6c4c7e18402379ff7eaa7ffb3f6f50f1a9
2017-06-27 18:53:02 +00:00
Kevin Chyn
958b3c9ba0 Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev am: 0e393d4163
am: 4efa54e342  -s ours

Change-Id: I11106a971c6a6950c1868e2a0a6897902117a46e
2017-06-27 18:52:13 +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
Sean Stout
d695f232d5 Merge "Add Night Light to Settings widget" into oc-dr1-dev
am: 2b0ea1c710

Change-Id: I1431c67495c1c49dd727241a9a0993b78b053960
2017-06-27 18:10:15 +00:00
Sean Stout
2b0ea1c710 Merge "Add Night Light to Settings widget" into oc-dr1-dev 2017-06-27 18:04:30 +00: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
Bill Yi
8e132ce53c Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07:00
Bill Yi
fda3a11ba7 Import translations. DO NOT MERGE
Change-Id: I032ef2ee9e18202c2b114497577e8fd770ec6775
Auto-generated-cl: translation import
2017-06-27 00:20:56 -07: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