OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Add list-select as an inline result" into oc-dr1-dev am: e455c8f377
Matthew Fritze [Wed, 28 Jun 2017 20:40:42 +0000 (20:40 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev am: e455c8f377
am: 46483a1a29

Change-Id: Ia2f55440571504c66b67276990e9fde19a1709fa

6 years agoMerge "Add list-select as an inline result" into oc-dr1-dev
Matthew Fritze [Wed, 28 Jun 2017 20:33:36 +0000 (20:33 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev
am: e455c8f377

Change-Id: I2b1e27042120dcb8121565ff58c21de0077837f3

6 years agoMerge "Change to use new suggestion/condition UI."
TreeHugger Robot [Wed, 28 Jun 2017 20:27:27 +0000 (20:27 +0000)]
Merge "Change to use new suggestion/condition UI."

6 years agoMerge "Add list-select as an inline result" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 20:27:00 +0000 (20:27 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev

6 years agoMerge "Hide the IDLE in "app list"" into oc-dr1-dev am: 9a30ceab83
jackqdyulei [Wed, 28 Jun 2017 19:48:46 +0000 (19:48 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev am: 9a30ceab83
am: 881b581e0a

Change-Id: I1a63208cc637be0f9f5ab1e4171b59e498d381ee

6 years agoMerge "Update the UI for battery header" into oc-dr1-dev am: 923f50fce6
jackqdyulei [Wed, 28 Jun 2017 19:48:24 +0000 (19:48 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev am: 923f50fce6
am: 9d4a2806a8

Change-Id: I28f110fef49db0aca036eb06c5c3f4d1249522de

6 years agoMerge "Hide the IDLE in "app list"" into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 19:45:17 +0000 (19:45 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev
am: 9a30ceab83

Change-Id: I3e1b14434ae00357f0193bb917469319a212b155

6 years agoMerge "Update the UI for battery header" into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev
am: 923f50fce6

Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e

6 years agoMerge "Hide the IDLE in "app list"" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 19:38:20 +0000 (19:38 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev

6 years agoMerge "Update the UI for battery header" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 19:37:40 +0000 (19:37 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev

6 years agoChange to use new suggestion/condition UI.
Doris Ling [Wed, 28 Jun 2017 18:22:44 +0000 (11:22 -0700)]
Change to use new suggestion/condition UI.

Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.

Bug: 37645754
Bug: 62621808
Test: make RunSettingsRoboTests
Change-Id: I3421a9e5182f6606843392d6fae8b9f07c5f2e46

6 years agoAdd list-select as an inline result
Matthew Fritze [Fri, 23 Jun 2017 17:05:07 +0000 (10:05 -0700)]
Add list-select as an inline result

Move the majority of the Setting set & get logic into
InlinePayload, but add formatting of input to each
concrete payload class.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I08932871554beb4a04625f05f8555a5b3a887fe2

6 years agoMerge "Add location check action for bt anomaly" into oc-dr1-dev am: a6b24388fc
Lei Yu [Wed, 28 Jun 2017 18:13:20 +0000 (18:13 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev am: a6b24388fc
am: 91dbfc6ee9

Change-Id: Ib7f5560b4ef44cb14bcf5e3633b09d179816b221

6 years agoMerge "Add location check action for bt anomaly" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 18:05:34 +0000 (18:05 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev
am: a6b24388fc

Change-Id: I2f1e1b65a5d7583ff76d77d3923df5ad7e1e652e

6 years agoMerge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00
jackqdyulei [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00
am: cbdaa2b56a

Change-Id: I1c260f3d1d089ae46ddba08dfc83063085ecbe42

6 years agoMerge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 17:57:48 +0000 (17:57 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
am: d6df3b3d00

Change-Id: I3ca5d821c33860f35d7fd37c0ddb92516095d099

6 years agoMerge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7
Lei Yu [Wed, 28 Jun 2017 17:57:46 +0000 (17:57 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7
am: d3f035af0a

Change-Id: If1a3d3b931130efa18014538bc95c2d9ac41d410

6 years agoMerge "Add location check action for bt anomaly" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:54:59 +0000 (17:54 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev

6 years agoMerge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:54:20 +0000 (17:54 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am: 451b7edfd7

Change-Id: I609e926c481e991d4039e42d0872ebcfd218679b

6 years agoMerge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:53:30 +0000 (17:53 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev

6 years agoMerge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev

6 years agoMerge "Update string: Gesture setting title" into oc-dr1-dev am: b365594242
Fan Zhang [Wed, 28 Jun 2017 17:47:45 +0000 (17:47 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev am: b365594242
am: 1d16eb3622

Change-Id: I08b48e4e3c6049ddb9e25a3733b7f19b012bb051

6 years agoMerge "Update string: Gesture setting title" into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 17:44:16 +0000 (17:44 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev
am: b365594242

Change-Id: I86d464edb6c4cf00e8e5062ef42b2717947f747a

6 years agoMerge "Update string: Gesture setting title" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:39:08 +0000 (17:39 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev

6 years agoUpdate the UI for battery header
jackqdyulei [Tue, 27 Jun 2017 01:40:49 +0000 (18:40 -0700)]
Update the UI for battery header

1. Make battery icon align to the end and make text layout
take all the other space.
2. Update the spec based on red line.

Bug: 63037934
Test: Screenshot
Change-Id: I1adbf5ce3e54712cbdc276db2357c7a24b48fe65

6 years agoMerge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev am: 7ea8ecdae1
jackqdyulei [Wed, 28 Jun 2017 17:20:04 +0000 (17:20 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev am: 7ea8ecdae1
am: fc55a3cef1

Change-Id: I7d23a1bab37417064a1ffc358f9856d711426c19

6 years agoMerge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 17:16:34 +0000 (17:16 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
am: 7ea8ecdae1

Change-Id: Ie6b814cf75ab555a94f2eb204499d10ae7a4cb0e

6 years agoMerge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev

6 years agoUpdate string: Gesture setting title
Fan Zhang [Wed, 28 Jun 2017 15:38:23 +0000 (08:38 -0700)]
Update string: Gesture setting title

Change-Id: Ib73e300cb4b809dcc1da594ac6f84d9d020aeac9
Fix: 36685646
Test: visual

6 years agoMerge "Fix crash when initializing Settings suggestions." into oc-dr1-dev am: c074c1c8fe
Doris Ling [Wed, 28 Jun 2017 01:50:20 +0000 (01:50 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev am: c074c1c8fe
am: da9d206916

Change-Id: Ia2d3416b079c617450562eb0daf3ab3625b83d0f

6 years agoMerge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
Doris Ling [Wed, 28 Jun 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
am: c074c1c8fe

Change-Id: Ibe3d07e72916fd45c1959e4dc194040b5bed3d17

6 years agoMerge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 01:41:32 +0000 (01:41 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev

6 years agoMerge "Trim search query when initializing installed app searcher." into oc-dr1-dev...
Fan Zhang [Wed, 28 Jun 2017 00:38:30 +0000 (00:38 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev am: a2c3828ede
am: b4e6874088

Change-Id: Ic2bf3841057347cd3a2556e53c5a5613135d9f4c

6 years agoAssist gesture settings should reflect assistant eligibility/preferences am: 1b44a87987
Kevin Chyn [Wed, 28 Jun 2017 00:35:32 +0000 (00:35 +0000)]
Assist gesture settings should reflect assistant eligibility/preferences am: 1b44a87987
am: cdcceec0fb

Change-Id: Ia5a061381db8d5e36ce1d31ac89ee2c58af27989

6 years agoMerge "Trim search query when initializing installed app searcher." into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev
am: a2c3828ede

Change-Id: I169e01d0fbcbe5fa85710daec366e6025e890098

6 years agoHide the IDLE in "app list"
jackqdyulei [Wed, 28 Jun 2017 00:31:09 +0000 (17:31 -0700)]
Hide the IDLE in "app list"

Also don't smear it.

Bug: 62423075
Test: RunSettingsRoboTests
Change-Id: I74072f9dde0dcf7b9a4abb05b86fe2102b618d6a

6 years agoAssist gesture settings should reflect assistant eligibility/preferences
Kevin Chyn [Wed, 28 Jun 2017 00:29:36 +0000 (00:29 +0000)]
Assist gesture settings should reflect assistant eligibility/preferences
am: 1b44a87987

Change-Id: Ifebce52e57590839770e2ea46eadb9e99abe5673

6 years agoMerge "Trim search query when initializing installed app searcher." into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 00:28:58 +0000 (00:28 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev

6 years agoFix the getForegroundActivityTotalTimeMs
jackqdyulei [Tue, 27 Jun 2017 22:59:35 +0000 (15:59 -0700)]
Fix the getForegroundActivityTotalTimeMs

It should return milliseconds, not microseconds time

Bug: 63073847
Test: RunSettingsRoboTests
Change-Id: Ib7ddb947646062fc50a40d300829389e0ac401ee

6 years agoAdd location check action for bt anomaly
jackqdyulei [Tue, 20 Jun 2017 17:09:04 +0000 (10:09 -0700)]
Add location check action for bt anomaly

This cl adds action to turn off location permission for both
ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION by using API
in RuntimePermissionPresenter

Bug: 36921532
Test: runtest -x LocationCheckActionTest

Change-Id: Ibe1e2908bd745a137d92a70a8432e9f866c1be61

6 years agoMerge "Update string id to make it more generic"
TreeHugger Robot [Tue, 27 Jun 2017 23:06:40 +0000 (23:06 +0000)]
Merge "Update string id to make it more generic"

6 years agoAssist gesture settings should reflect assistant eligibility/preferences
Kevin Chyn [Sat, 24 Jun 2017 01:01:06 +0000 (18:01 -0700)]
Assist gesture settings should reflect assistant eligibility/preferences

Fixes: 37707753
Fixes: 62843146

Test: manual testing of settings && make -j RunSettingsRoboTests
Change-Id: I5e606686a03960e5cfe1df2f77c48d6ece9c363a

6 years agoFix crash when initializing Settings suggestions.
Doris Ling [Tue, 27 Jun 2017 20:56:32 +0000 (13:56 -0700)]
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

6 years agoUpdate string id to make it more generic
Fan Zhang [Tue, 27 Jun 2017 21:24:47 +0000 (14:24 -0700)]
Update string id to make it more generic

Test: builds
Bug: 62354743
Change-Id: I321f5e3d7560dbc21d52dbaa8ebe2df07f99a3db

6 years agoHide the summary for app in PowerUsageAdvanced
jackqdyulei [Tue, 27 Jun 2017 20:49:17 +0000 (13:49 -0700)]
Hide the summary for app in PowerUsageAdvanced

Bug: 62032053
Test: RunSettingsRoboTests
Change-Id: I83fdd20ef040d102b5d5210a10a810c119f5cf44

6 years agoAdd quickUpdate method to BatteryHeaderPrefCtrl
jackqdyulei [Tue, 27 Jun 2017 00:54:09 +0000 (17:54 -0700)]
Add quickUpdate method to BatteryHeaderPrefCtrl

This cl adds a method called quickUpdateHeaderPreference, which will
update the following items immediately without waiting for the
BatteryInfo:
1. Battery level
2. Battery charging status(whether to show lighting bolt)
3. Clear the charging summary

Note: this cl doesn't optimize the BatteryInfo loading time.

This cl also rename "TimeText" to "BatteryPercentText" because in
new UI that textview is used to display battery percentage.

Bug: 63029231
Test: RunSettingsRoboTests
Change-Id: I8cc886b35e937d73b46e47e303ff0994ccdcb61c

6 years agoImport translations. DO NOT MERGE am: 8e132ce53c -s ours am: 38b7d50a49 -s ours
Bill Yi [Tue, 27 Jun 2017 20:30:30 +0000 (20:30 +0000)]
Import translations. DO NOT MERGE am: 8e132ce53c  -s ours am: 38b7d50a49  -s ours
am: 47ff496407  -s ours

Change-Id: I26b4e5178beb47f231e73889675f36bd2340d9e9

6 years agoMerge "Improve delete fingerprint UI."
TreeHugger Robot [Tue, 27 Jun 2017 20:27:46 +0000 (20:27 +0000)]
Merge "Improve delete fingerprint UI."

6 years agoImport translations. DO NOT MERGE am: 8e132ce53c -s ours
Bill Yi [Tue, 27 Jun 2017 20:21:25 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE am: 8e132ce53c  -s ours
am: 38b7d50a49  -s ours

Change-Id: I9f2d7d683482701ef2a26cf2d03be8bdba8fa079

6 years agoImport translations. DO NOT MERGE am: 8e132ce53c -s ours am: 7c952faa77 -s ours
Bill Yi [Tue, 27 Jun 2017 20:20:00 +0000 (20:20 +0000)]
Import translations. DO NOT MERGE am: 8e132ce53c  -s ours am: 7c952faa77  -s ours
am: 3c2a60e813  -s ours

Change-Id: Ifa974eb7ed6d61b78e2aac66c027b40920948e03

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 98bbb157a9 -s ours
Bill Yi [Tue, 27 Jun 2017 20:19:36 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 98bbb157a9  -s ours
am: 4b7bc479da  -s ours

Change-Id: I22490d0da5e44774b6d2b5015bbf6f6e9e02ba5b

6 years agoImport translations. DO NOT MERGE am: 8e132ce53c -s ours
Bill Yi [Tue, 27 Jun 2017 20:15:40 +0000 (20:15 +0000)]
Import translations. DO NOT MERGE am: 8e132ce53c  -s ours
am: 7c952faa77  -s ours

Change-Id: Ib5bf7b801f9c5df19fd8c7ae070f4fe760356a3f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 27 Jun 2017 20:08:19 +0000 (20:08 +0000)]
Import translations. DO NOT MERGE
am: 8e132ce53c  -s ours

Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 20:06:53 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 98bbb157a9  -s ours

Change-Id: I65f40eb6eacfc157266ce57420bc9a1b6f508a6d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 27 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am: 8e132ce53c  -s ours

Change-Id: I1546d616bc8d0344d9538cdb0c5fb80b3454105a

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:52:22 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoTrim search query when initializing installed app searcher.
Fan Zhang [Tue, 27 Jun 2017 19:47:06 +0000 (12:47 -0700)]
Trim search query when initializing installed app searcher.

Change-Id: I502185d4b497b2edac32e4a8368be76d13b68259
Fix: 62885439
Test: make RunSettingsRoboTests

6 years agoMerge "Add Night Light to Settings widget" into oc-dr1-dev am: 2b0ea1c710
Sean Stout [Tue, 27 Jun 2017 19:18:59 +0000 (19:18 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev am: 2b0ea1c710
am: d695f232d5

Change-Id: I7275813e73a9eaf613ce74fc58bd2e89397514fd

6 years agoMerge "Reduce jank around loading view when opening data usage UI"
TreeHugger Robot [Tue, 27 Jun 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Reduce jank around loading view when opening data usage UI"

6 years agoMerge "Search results page polish" into oc-dr1-dev am: 692a4b5514
Andrew Sapperstein [Tue, 27 Jun 2017 18:59:35 +0000 (18:59 +0000)]
Merge "Search results page polish" into oc-dr1-dev am: 692a4b5514
am: a35b49a17d

Change-Id: I74370bad4f49ad1e9464e377057b5aebc74696aa

6 years agoMerge "Fix assist gesture settings summary" into oc-dr1-dev am: 63e36128e6
Kevin Chyn [Tue, 27 Jun 2017 18:56:15 +0000 (18:56 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev am: 63e36128e6
am: b26ac1f381  -s ours

Change-Id: If31e74e8064eb38e2d0894e8c0d4a963aafe4596

6 years agoMerge "Dashboard search bar polish" into oc-dr1-dev am: 3b7ed7ae65
Andrew Sapperstein [Tue, 27 Jun 2017 18:55:50 +0000 (18:55 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev am: 3b7ed7ae65
am: f4b40fa221  -s ours

Change-Id: Ib613926dfb92e20bb79d2237cdc898166665223f

6 years agoMerge "Rename buttons in lock screen setup" into oc-dr1-dev am: fbfca43e6e
Maurice Lam [Tue, 27 Jun 2017 18:55:20 +0000 (18:55 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev am: fbfca43e6e
am: 57e61ba4f3

Change-Id: Id070948b2fb600509c0b62f02d4189b4c00c504e

6 years agoMerge "Update skip button label to "Do it later"" into oc-dr1-dev am: b97f91c971
Maurice Lam [Tue, 27 Jun 2017 18:54:57 +0000 (18:54 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev am: b97f91c971
am: 467f39d243

Change-Id: Ibcb63391115160778939577fd7d34f6b84a77b49

6 years agoMerge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev am: 624212f43c
Maurice Lam [Tue, 27 Jun 2017 18:54:33 +0000 (18:54 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev am: 624212f43c
am: a3eb263479

Change-Id: Ibe7045461c17aaf3b761f746bac2a596b9e7e2a0

6 years agoMerge "Update buttons in FP find sensor" into oc-dr1-dev am: a102714c19
Maurice Lam [Tue, 27 Jun 2017 18:53:48 +0000 (18:53 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev am: a102714c19
am: 2cc641940d

Change-Id: If6155441bff70cd30160619cdd5a61d6fe562cec

6 years agoMerge "Update icon for language settings" into oc-dr1-dev am: 124232d6fa
Fan Zhang [Tue, 27 Jun 2017 18:53:25 +0000 (18:53 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev am: 124232d6fa
am: 6175c9cc6a

Change-Id: I46a0308bf9d3a7aa8397d337e99bc4a09eae2f00

6 years agoMerge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours am: 34fe9136c6 am...
daqi [Tue, 27 Jun 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8  -s ours am: 34fe9136c6 am: 96e566a68c
am: 49729cbd9e

Change-Id: I4805dd6c4c7e18402379ff7eaa7ffb3f6f50f1a9

6 years agoMerge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1...
Kevin Chyn [Tue, 27 Jun 2017 18:52:13 +0000 (18:52 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev am: 0e393d4163
am: 4efa54e342  -s ours

Change-Id: I11106a971c6a6950c1868e2a0a6897902117a46e

6 years agoMerge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339
jackqdyulei [Tue, 27 Jun 2017 18:46:14 +0000 (18:46 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339
am: e9d1f6f1ae

Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a

6 years agoMerge "resolve merge conflicts of 758b2d4ae6 to master"
TreeHugger Robot [Tue, 27 Jun 2017 18:39:31 +0000 (18:39 +0000)]
Merge "resolve merge conflicts of 758b2d4ae6 to master"

6 years agoImprove delete fingerprint UI.
Fan Zhang [Mon, 19 Jun 2017 21:40:23 +0000 (14:40 -0700)]
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

6 years agoMerge "Add Night Light to Settings widget" into oc-dr1-dev
Sean Stout [Tue, 27 Jun 2017 18:10:15 +0000 (18:10 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev
am: 2b0ea1c710

Change-Id: I1431c67495c1c49dd727241a9a0993b78b053960

6 years agoMerge "Add Night Light to Settings widget" into oc-dr1-dev
Sean Stout [Tue, 27 Jun 2017 18:04:28 +0000 (18:04 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev

6 years agoMerge "Search results page polish" into oc-dr1-dev
Andrew Sapperstein [Tue, 27 Jun 2017 17:02:58 +0000 (17:02 +0000)]
Merge "Search results page polish" into oc-dr1-dev
am: 692a4b5514

Change-Id: I9953971cfaa2c78b2be9fbd027f7cdb029bbb9c1

6 years agoMerge "Search results page polish" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Search results page polish" into oc-dr1-dev

6 years agoMerge "Show IMSI in RadioInfo."
TreeHugger Robot [Tue, 27 Jun 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Show IMSI in RadioInfo."

6 years agoMerge "Adjust a11y shortcut settings based on UX input"
Phil Weaver [Tue, 27 Jun 2017 15:09:33 +0000 (15:09 +0000)]
Merge "Adjust a11y shortcut settings based on UX input"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 27 Jun 2017 07:26:26 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 27 Jun 2017 07:20:56 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I032ef2ee9e18202c2b114497577e8fd770ec6775
Auto-generated-cl: translation import

6 years agoMerge "Fix assist gesture settings summary" into oc-dr1-dev
Kevin Chyn [Tue, 27 Jun 2017 03:34:30 +0000 (03:34 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev
am: 63e36128e6

Change-Id: I05d1d9129892ebf1049f771ebc2404bafee4d60a

6 years agoMerge "Fix assist gesture settings summary" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 03:28:41 +0000 (03:28 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev

6 years agoMerge "Dashboard search bar polish" into oc-dr1-dev
Andrew Sapperstein [Tue, 27 Jun 2017 02:35:15 +0000 (02:35 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev
am: 3b7ed7ae65

Change-Id: I85a67a54a79123db510cebdbc04e06cb6dfb420e

6 years agoMerge "Dashboard search bar polish" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 02:28:24 +0000 (02:28 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev

6 years agoresolve merge conflicts of 758b2d4ae6 to master
jackqdyulei [Tue, 27 Jun 2017 01:29:31 +0000 (18:29 -0700)]
resolve merge conflicts of 758b2d4ae6 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53

6 years agoMerge "Fix assist gesture settings summary"
TreeHugger Robot [Tue, 27 Jun 2017 01:22:13 +0000 (01:22 +0000)]
Merge "Fix assist gesture settings summary"

6 years agoMerge "Rename buttons in lock screen setup" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
am: fbfca43e6e

Change-Id: Ia7de9aba909a00bb2bf9acd01d897fcedcdfb4c2

6 years agoMerge "Update skip button label to "Do it later"" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
am: b97f91c971

Change-Id: Iea6dc3f9e7777b750203c36997b75c524f3699ea

6 years agoMerge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:16:46 +0000 (01:16 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
am: 624212f43c

Change-Id: I90b4d7d57a7dc3bca86f46b34b0f9af2b78ea574

6 years agoMerge "Update buttons in FP find sensor" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:16:16 +0000 (01:16 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
am: a102714c19

Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b

6 years agoMerge "Rename buttons in lock screen setup" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev

6 years agoMerge "Update skip button label to "Do it later"" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:36 +0000 (01:10 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev

6 years agoMerge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:22 +0000 (01:10 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev

6 years agoMerge "Update buttons in FP find sensor" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:09 +0000 (01:10 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev

6 years agoMerge "Remove unnecessary functions from AssistGestureFeatureProvider"
Kevin Chyn [Tue, 27 Jun 2017 00:45:26 +0000 (00:45 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider"

6 years agoSearch results page polish
Andrew Sapperstein [Mon, 26 Jun 2017 01:55:57 +0000 (18:55 -0700)]
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

6 years agoMerge "resolve merge conflicts of 31a2f413f8 to master"
TreeHugger Robot [Tue, 27 Jun 2017 00:14:10 +0000 (00:14 +0000)]
Merge "resolve merge conflicts of 31a2f413f8 to master"

6 years agoMerge "Dashboard search bar polish"
TreeHugger Robot [Tue, 27 Jun 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Dashboard search bar polish"

6 years agoRemove unnecessary functions from AssistGestureFeatureProvider
Kevin Chyn [Sat, 24 Jun 2017 21:16:47 +0000 (14:16 -0700)]
Remove unnecessary functions from AssistGestureFeatureProvider

Fixes: 62945918

Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e

6 years agoMerge "Remove redundant talkback readout when rebooting device"
TreeHugger Robot [Mon, 26 Jun 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Remove redundant talkback readout when rebooting device"