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
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
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
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
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
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
Alex Kulesza
5252372c15
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
...
am: b76fe783e0
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
2017-07-31 19:30:16 +00:00
Alex Kulesza
e9216ccbd3
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
...
am: 8fd9c28b7e
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
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
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
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
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
2017-07-31 19:27:34 +00:00
Fan Zhang
1f0b09c924
Merge "Layout tweak for app action buttons" into oc-mr1-dev
...
am: 48d54ff2f6
2017-07-31 19:27:13 +00:00
TreeHugger Robot
8fd9c28b7e
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
2017-07-31 19:19:03 +00:00
Fan Zhang
1b62cfb973
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
...
am: 9064072ed7
2017-07-31 19:12:11 +00:00
jackqdyulei
68af5f3a5d
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
...
am: d6c9a8b5b2
2017-07-31 19:11:31 +00:00
Fan Zhang
56538f1775
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
...
am: 9064072ed7
2017-07-31 19:09:10 +00:00
jackqdyulei
b3a488c40c
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
...
am: d6c9a8b5b2
2017-07-31 19:08:31 +00:00
TreeHugger Robot
8be9d6519f
Merge "Use package from sipper if default is null" into oc-mr1-dev
2017-07-31 18:58:22 +00:00
TreeHugger Robot
48d54ff2f6
Merge "Layout tweak for app action buttons" into oc-mr1-dev
2017-07-31 18:57:09 +00:00
TreeHugger Robot
9064072ed7
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
2017-07-31 18:56:02 +00:00
TreeHugger Robot
d6c9a8b5b2
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
2017-07-31 18:55:40 +00:00
Ajay Nadathur
0724a106fe
Merge "Change vision settings suggestion title" into oc-mr1-dev am: 9b89fb0080
...
am: 40c652b221
2017-07-31 18:34:29 +00:00
Ajay Nadathur
40c652b221
Merge "Change vision settings suggestion title" into oc-mr1-dev
...
am: 9b89fb0080
2017-07-31 18:30:57 +00:00
