Daniel Nishi
caacba845c
Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: 60287a50e8" into oc-dr1-dev-plus-aosp
...
am: feaa8fe083
2017-06-09 00:30:31 +00:00
Daniel Nishi
9d5d0513d5
Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: f928324747
...
am: b50e0063e2
2017-06-09 00:30:02 +00:00
Android Build Merger (Role)
feaa8fe083
Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: 60287a50e8" into oc-dr1-dev-plus-aosp
2017-06-09 00:20:58 +00:00
Daniel Nishi
08f3e244c8
Merge "Update the music files icon." into oc-dev am: 47c6afde7f
...
am: 60287a50e8
2017-06-09 00:20:34 +00:00
Daniel Nishi
b50e0063e2
Merge "Update the music files icon." into oc-dev am: 47c6afde7f
...
am: f928324747
2017-06-09 00:20:31 +00:00
Daniel Nishi
f928324747
Merge "Update the music files icon." into oc-dev
...
am: 47c6afde7f
2017-06-09 00:19:04 +00:00
Daniel Nishi
60287a50e8
Merge "Update the music files icon." into oc-dev
...
am: 47c6afde7f
2017-06-09 00:19:03 +00:00
TreeHugger Robot
e5b1eccd54
Merge "Create new category for lock screen redaction"
2017-06-09 00:15:26 +00:00
TreeHugger Robot
47c6afde7f
Merge "Update the music files icon." into oc-dev
2017-06-09 00:13:19 +00:00
Alex Kulesza
bb13a785bb
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev am: bf9cb113c1
...
am: 68be1736d3
2017-06-08 23:44:49 +00:00
Alex Kulesza
68be1736d3
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
...
am: bf9cb113c1
2017-06-08 23:28:28 +00:00
TreeHugger Robot
bf9cb113c1
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
2017-06-08 23:23:01 +00:00
Bill Yi
a292ff1324
Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours am: 52c0cd702c -s ours
...
am: 94e485819c
2017-06-08 23:01:23 +00:00
Bill Yi
02605635d6
Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours am: 7134ca433b -s ours
...
am: a372e3c40e
2017-06-08 23:00:31 +00:00
Bill Yi
94e485819c
Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours
...
am: 52c0cd702c
2017-06-08 22:55:00 +00:00
Bill Yi
a372e3c40e
Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours
...
am: 7134ca433b
2017-06-08 22:53:09 +00:00
Bill Yi
52c0cd702c
Import translations. DO NOT MERGE
...
am: 29a7bce4e5
2017-06-08 22:48:47 +00:00
Bill Yi
7134ca433b
Import translations. DO NOT MERGE
...
am: 29a7bce4e5
2017-06-08 22:46:57 +00:00
Lei Yu
eac535700d
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev am: 377907ebad
...
am: d16769a168
2017-06-08 18:08:03 +00:00
Lei Yu
d16769a168
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
...
am: 377907ebad
2017-06-08 18:05:05 +00:00
Lei Yu
377907ebad
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
2017-06-08 17:59:34 +00:00
Daniel Nishi
e1571b8dac
Update the music files icon.
...
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes: 62291640
Test: Manual
2017-06-08 10:24:14 -07:00
Alex Kulesza
c57ceaaa8c
Implement general projection curve support for UsageGraph.
...
Previously, projections were hard-coded in UsageGraph as lines from the
last known point to the corner of the graph. This change replaces that
with support for arbitrary projection curves. Logic for hiding/showing
the projection is now gone; if the client does not want a projection,
it simply does not supply one.
There are two active clients of this code: the data usage graph and the
battery usage graph. The data graph does not use projections and is
essentially unchanged. The battery graph now implements its linear
extrapolation directly in BatteryInfo.
Bug: 38400320
Test: make SettingsUnitTests SettingsGoogleUnitTests
Test: manual (screenshots in comments)
Change-Id: I754e66f6b18ecb8b936143399f8e9e3368fc1ce4
2017-06-08 16:59:14 +00:00
Bill Yi
29a7bce4e5
Import translations. DO NOT MERGE
...
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
2017-06-08 07:59:38 -07:00
Bartosz Fabianowski
334db34e12
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5 am: 74f5dc85b9
...
am: 9c105007c3
2017-06-08 07:03:41 +00:00
Bartosz Fabianowski
f9bbd63106
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5 am: 25f0d19504
...
am: cb8242c21d
2017-06-08 07:03:11 +00:00
Bartosz Fabianowski
9c105007c3
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5
...
am: 74f5dc85b9
2017-06-08 06:27:55 +00:00
Bartosz Fabianowski
cb8242c21d
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5
...
am: 25f0d19504
2017-06-08 06:25:12 +00:00
Bartosz Fabianowski
25f0d19504
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
...
am: 9e94d80fa5
2017-06-08 06:13:42 +00:00
Bartosz Fabianowski
74f5dc85b9
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
...
am: 9e94d80fa5
2017-06-08 05:55:40 +00:00
TreeHugger Robot
9e94d80fa5
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
2017-06-08 05:51:15 +00:00
Maurice Lam
96ae3f82b3
Create new category for lock screen redaction
...
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug: 62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
2017-06-07 20:59:51 -07:00
jackqdyulei
cc446060e5
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2 am: 0d889079af
...
am: 6718f67018
2017-06-08 02:19:32 +00:00
jackqdyulei
c7ecd6ebff
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2 am: 33cb1408e2
...
am: 83bcc42e77
2017-06-08 02:19:10 +00:00
jackqdyulei
6718f67018
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2
...
am: 0d889079af
2017-06-08 02:18:23 +00:00
jackqdyulei
83bcc42e77
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2
...
am: 33cb1408e2
2017-06-08 02:16:20 +00:00
jackqdyulei
0d889079af
Merge "Use default package in BatteryEntry" into oc-dev
...
am: f5f51c4cf2
2017-06-08 02:14:25 +00:00
jackqdyulei
33cb1408e2
Merge "Use default package in BatteryEntry" into oc-dev
...
am: f5f51c4cf2
2017-06-08 02:13:24 +00:00
TreeHugger Robot
f5f51c4cf2
Merge "Use default package in BatteryEntry" into oc-dev
2017-06-08 02:10:30 +00:00
jackqdyulei
c3694e425e
Add debug data in AnomalyLoader
...
Bug: 62299540
Test: RunSettingsRoboTests
Change-Id: Id20db9fc0da8e090385caa982f2fb5a6fa0b2f38
(cherry picked from commit 5753e6d97e
2017-06-08 00:12:43 +00:00
TreeHugger Robot
fbd376b1ba
Merge "Add debug data in AnomalyLoader"
2017-06-07 21:51:58 +00:00
Matthew Fritze
17ebf1f4e2
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f am: 08bdbf3d5a
...
am: d2f266bcfa
2017-06-07 21:07:54 +00:00
Matthew Fritze
9491a8998e
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f am: 7868a7525b
...
am: ec0206efda
2017-06-07 21:07:11 +00:00
Matthew Fritze
d2f266bcfa
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f
...
am: 08bdbf3d5a
2017-06-07 20:54:55 +00:00
Matthew Fritze
ec0206efda
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f
...
am: 7868a7525b
2017-06-07 20:52:24 +00:00
Matthew Fritze
7868a7525b
Merge "Hide Display Theme from search results when not available" into oc-dev
...
am: 9f2f9e331f
2017-06-07 20:46:57 +00:00
Matthew Fritze
08bdbf3d5a
Merge "Hide Display Theme from search results when not available" into oc-dev
...
am: 9f2f9e331f
2017-06-07 20:46:56 +00:00
TreeHugger Robot
9f2f9e331f
Merge "Hide Display Theme from search results when not available" into oc-dev
2017-06-07 20:39:38 +00:00
jackqdyulei
a64839b59d
Use default package in BatteryEntry
...
Before this cl, we use the first package name if there is a name
list in BatterySipper.
We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.
Bug: 62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
2017-06-07 13:20:47 -07:00
Matthew Fritze
ac5956a5cf
Hide Display Theme from search results when not available
...
Test: make RunSettingsRoboTests
Fixes: 62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
2017-06-07 16:21:44 +00:00
