Matthew Fritze
fdbf4f057b
Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"
...
This reverts commit a504291eef
2017-08-01 00:51:34 +00:00
Matthew Fritze
9245af8ce5
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
...
am: 57992394bf
2017-08-01 00:45:29 +00:00
Matthew Fritze
da3462e366
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
...
am: 57992394bf
2017-08-01 00:45:29 +00:00
Fan Zhang
a0a165b71a
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev am: 5e9b138691
...
am: 1f62645592
2017-08-01 00:42:41 +00:00
Fan Zhang
1f62645592
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
...
am: 5e9b138691
2017-08-01 00:41:26 +00:00
Matthew Fritze
68ae06ab17
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev am: a504291eef
...
am: 44a17e6c51
2017-08-01 00:39:55 +00:00
TreeHugger Robot
5e9b138691
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
2017-08-01 00:38:45 +00:00
TreeHugger Robot
57992394bf
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
2017-08-01 00:37:26 +00:00
Matthew Fritze
5d4a45da39
Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
...
am: 7907bd215d
2017-08-01 00:35:36 +00:00
Matthew Fritze
44a17e6c51
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
...
am: a504291eef
2017-08-01 00:35:20 +00:00
Eric Schwarzenbach
7f509d341e
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev am: 5e888ad7b6
...
am: 666d70ea76
2017-08-01 00:29:04 +00:00
Matthew Fritze
7907bd215d
Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
2017-08-01 00:28:57 +00:00
jackqdyulei
d6084baa89
Add shadow and wrapper classes
...
These classes are used for accessibility service. Also
add a new Availablity type.
Bug: 62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
Merged-In: Ia2ff72dd04fd99b17809822907746c2411cecb62
2017-07-31 17:25:54 -07:00
Matthew Fritze
57b641eee8
resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
2017-07-31 17:24:17 -07:00
Eric Schwarzenbach
666d70ea76
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
...
am: 5e888ad7b6
2017-08-01 00:17:31 +00:00
Matthew Fritze
a504291eef
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
2017-07-31 17:10:24 -07:00
TreeHugger Robot
5e888ad7b6
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
2017-08-01 00:02:38 +00:00
jackqdyulei
aa7ae78467
Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b am: c65e873d3e -s ours" into oc-mr1-dev-plus-aosp
...
am: e140bc3795
2017-07-31 23:56:23 +00:00
jackqdyulei
664023d9ca
Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b -s ours am: f1dfb105cd -s ours
...
am: 33b0f20c21
2017-07-31 23:55:50 +00:00
Android Build Merger (Role)
e140bc3795
Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b am: c65e873d3e -s ours" into oc-mr1-dev-plus-aosp
2017-07-31 23:52:47 +00:00
jackqdyulei
30420ae268
Merge "Add shadow and wrapper classes" into oc-mr1-dev am: 1b2408433a
...
am: 04c28ab23c
2017-07-31 23:52:47 +00:00
jackqdyulei
33b0f20c21
Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b -s ours
...
am: f1dfb105cd
2017-07-31 23:52:23 +00:00
jackqdyulei
534d566f2c
Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b
...
am: c65e873d3e
2017-07-31 23:52:23 +00:00
Matthew Fritze
334db456a6
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev am: 2972b5c992
...
am: 56f5ac21a5
2017-07-31 23:52:20 +00:00
Matthew Fritze
a03a707f74
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
...
am: 9feab7a8a5
2017-07-31 23:50:03 +00:00
jackqdyulei
f1dfb105cd
Merge "Use package from sipper if default is null" into oc-dr1-dev
...
am: ca24d0435b
2017-07-31 23:49:11 +00:00
jackqdyulei
c65e873d3e
Merge "Use package from sipper if default is null" into oc-dr1-dev
...
am: ca24d0435b
2017-07-31 23:49:07 +00:00
jackqdyulei
04c28ab23c
Merge "Add shadow and wrapper classes" into oc-mr1-dev
...
am: 1b2408433a
2017-07-31 23:48:51 +00:00
TreeHugger Robot
9feab7a8a5
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
2017-07-31 23:48:02 +00:00
Matthew Fritze
56f5ac21a5
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
...
am: 2972b5c992
2017-07-31 23:45:31 +00:00
TreeHugger Robot
1b2408433a
Merge "Add shadow and wrapper classes" into oc-mr1-dev
2017-07-31 23:44:43 +00:00
TreeHugger Robot
ca24d0435b
Merge "Use package from sipper if default is null" into oc-dr1-dev
2017-07-31 23:42:49 +00:00
TreeHugger Robot
2972b5c992
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
2017-07-31 23:35:29 +00:00
Fan Zhang
eef16a8b0f
Disable AssistGestureSetting search if not supported
...
Change-Id: Id5f79506635592d98783b2b99b7ee09dd223c43c
Fixes: 64066820
Test: robotests
2017-07-31 15:46:46 -07:00
Tony Mantler
2d3dec6096
Refactor SystemPropPoker
...
Bug: 62442606
Test: SystemPropPokerTest
Change-Id: I07d3e80938c7861cde074d8968a1c95b92981231
2017-07-31 15:43:49 -07:00
Matthew Fritze
621c24861c
Fix DataUsageSummary non-indexable keys
...
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Manual merge for: ag/2631595
Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
2017-07-31 14:20:31 -07:00
Matthew Fritze
5c6af383af
Fix DataUsageSummary non-indexable keys
...
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Change-Id: I2097a3ac4ffd714b60299c07b29c81f246e414eb
Merged-In: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
2017-07-31 21:18:54 +00:00
Tony Mantler
3d84d56336
Remove development settings prefs file
...
Move DevelopmentSettingsEnabler to SettingsLib
Bug: 64159590
Test: DevelopmentSettingsEnablerTest
Change-Id: Id609266019e05a3e06b4ee3bc10de9c019628a42
2017-07-31 14:01:09 -07:00
Fan Zhang
e4705a6f3e
Update icons to match quick setting
...
Change-Id: I704fd31cfb48a32530644ceafdd750bbc9adbd0e
Fix: 62658839
Test: visual
2017-07-31 13:37:55 -07:00
Alex Kulesza
3eb22656eb
Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e am: e9216ccbd3" into oc-mr1-dev-plus-aosp
...
am: 8bc726d770
2017-07-31 20:23:10 +00:00
Sundeep Ghuman
45bb3a1a77
onConnectedChanged should not update access points
...
In WifiSettings, invocation of onConnectedChanged should not update
access points. This is controller by another callback,
onAccessPointsChanged. Furthermore, this is fired before any changes
have even been made to the AccessPoints.
This is exacerbating a problem where old scan results are not shown in
the WifiPicker, or sometimes the platform does not return any scan
results.
Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Ibbc067d9952525b4edd85389996509e9b17bb1bd
2017-07-31 13:23:02 -07:00
Alex Kulesza
b509f87040
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e am: b76fe783e0
...
am: 5252372c15
2017-07-31 20:22:49 +00:00
Fan Zhang
6deb41abaa
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7 am: 56538f1775" into oc-mr1-dev-plus-aosp
...
am: 17cee2d180
2017-07-31 20:22:29 +00:00
Fan Zhang
543d7f1414
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7 am: 1b62cfb973" into oc-mr1-dev-plus-aosp
...
am: 6d591a3682
2017-07-31 20:22:05 +00:00
jackqdyulei
8c50e81e0c
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2 am: b3a488c40c" into oc-mr1-dev-plus-aosp
...
am: c3829cab9d
2017-07-31 20:21:27 +00:00
jackqdyulei
7620f6555a
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2 am: 68af5f3a5d" into oc-mr1-dev-plus-aosp
...
am: d8664d6cba
2017-07-31 20:20:47 +00:00
jackqdyulei
2955995268
Merge "Use package from sipper if default is null" into oc-mr1-dev am: 8be9d6519f
...
am: 6399937d47
2017-07-31 20:20:20 +00:00
Fan Zhang
aece99fd11
Merge "Layout tweak for app action buttons" into oc-mr1-dev am: 48d54ff2f6
...
am: 1f0b09c924
2017-07-31 20:20:00 +00:00
Android Build Merger (Role)
8bc726d770
Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e am: e9216ccbd3" into oc-mr1-dev-plus-aosp
2017-07-31 19:34:15 +00:00
Alex Kulesza
5b0dd165ed
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
...
am: e9216ccbd3
2017-07-31 19:33:57 +00:00
