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
Change-Id: I8e6852561bba50ed44d17f52099ebf82becd5433
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
-s ours
Change-Id: I5439c17182dce2f149033e749161d00345a5dd12
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
-s ours
Change-Id: Ife2707a5bbae6d9e3aea0afad8f039ddfedc28af
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
Change-Id: If01fbb956c5171a1fe9b64794e80a8b734ca6b54
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
-s ours
Change-Id: I08f20e90020bfc6b3a1f85b104f8c800c9336c87
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
-s ours
Change-Id: If907662fdbfa21593960b0cd2910271df14766ed
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
Change-Id: I6c0130746d4a5dc6324ef330384cf77b7b64c18e
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
Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5
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
-s ours
Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e
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
Change-Id: Idfa84fd3c07b228ddc689244b7d33ca66463d25f
2017-07-31 23:49:07 +00:00
jackqdyulei
04c28ab23c
Merge "Add shadow and wrapper classes" into oc-mr1-dev
...
am: 1b2408433a
Change-Id: If0839d6ae74defedaa3c8dcf20fb80c1cccab46e
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
Change-Id: I3936a622769dbb315c9f191982cd5b74ae1c7564
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
Change-Id: If4a740fbd056f88937dbd32a468baab542ff959c
2017-07-31 20:23:10 +00:00
Alex Kulesza
b509f87040
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
am: b76fe783e0
...
am: 5252372c15
Change-Id: I9ec7bf6f03d0c08b77db145abdbc1557beaa30aa
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
Change-Id: I5494796aac471251cff77d6df69f9ebd991ad26f
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
Change-Id: Ib7739df2540340e6ef7eea921f8833572864196d
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
Change-Id: I64f2a3e4560fe7cab63deb194df0db1b8ddfa78b
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
Change-Id: I73affa5a3fb146ac4ddc62a96b16b54a4554b224
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
Change-Id: I54392bce57eb20c96e51ee5270cc19d4b8d2b933
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
Change-Id: I253da71b17e387c089b5fd3ee29fd4ac6597429d
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
Change-Id: I97720a853f9d5fde41c2920ced45bbd4079bae68
2017-07-31 19:33:57 +00:00
Alex Kulesza
5252372c15
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
...
am: b76fe783e0
Change-Id: I1f56ef0bd997293c0f1912abc2c5fc193c060684
2017-07-31 19:33:55 +00:00
jackqdyulei
1f0f6317f6
Use package from sipper if default is null
...
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.
This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null
Bug: 64127162
Test: RunSettingsRoboTests
Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
Merged-In: I5d21afca17f177817976758c28ed86b3a10e95eb
2017-07-31 12:33:10 -07:00
Alex Kulesza
b76fe783e0
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
...
am: 8fd9c28b7e
Change-Id: I8a24c0d388524c34d19a2f1bfd0e8f53b6c9304c
2017-07-31 19:30:16 +00:00
Alex Kulesza
e9216ccbd3
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
...
am: 8fd9c28b7e
Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c
2017-07-31 19:30:16 +00:00
Android Build Merger (Role)
17cee2d180
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 56538f1775" into oc-mr1-dev-plus-aosp
2017-07-31 19:28:51 +00:00
Android Build Merger (Role)
6d591a3682
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 1b62cfb973" into oc-mr1-dev-plus-aosp
2017-07-31 19:28:45 +00:00
Fan Zhang
9b3dfd9d2c
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
...
am: 56538f1775
Change-Id: Id3e5d86f60da922dcdbfa83e042b8442a674f0c7
2017-07-31 19:28:33 +00:00
Fan Zhang
b43867dc5e
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
...
am: 1b62cfb973
Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
2017-07-31 19:28:28 +00:00
Android Build Merger (Role)
c3829cab9d
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
am: b3a488c40c" into oc-mr1-dev-plus-aosp
2017-07-31 19:28:26 +00:00
Android Build Merger (Role)
d8664d6cba
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
am: 68af5f3a5d" into oc-mr1-dev-plus-aosp
2017-07-31 19:28:21 +00:00
jackqdyulei
3d391cac88
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
...
am: b3a488c40c
Change-Id: Iced9212fa792abc6d24c68e3177babb8c61b9bbb
2017-07-31 19:27:56 +00:00
jackqdyulei
7bea7b2cdd
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
...
am: 68af5f3a5d
Change-Id: I24a1e496688277428b680eaa0a66dd12e0eac3d3
2017-07-31 19:27:46 +00:00
jackqdyulei
6399937d47
Merge "Use package from sipper if default is null" into oc-mr1-dev
...
am: 8be9d6519f
Change-Id: I6755b14b62b9ec8958ce2aa7e99b3faa4fbb7aa7
2017-07-31 19:27:34 +00:00