jackqdyulei
2bfd2c0208
Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f am: 6525053801" into oc-dr1-dev-plus-aosp
...
am: 8fcd16a93f
2017-06-09 03:04:00 +00:00
Fan Zhang
2cc1669ed3
Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am: bdc0816982" into oc-dr1-dev-plus-aosp
...
am: afa34b1cc4
2017-06-09 03:03:14 +00:00
jackqdyulei
1ba91b2568
Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f am: 424edd3064
...
am: b0490baa77
2017-06-09 03:02:45 +00:00
Android Build Merger (Role)
8fcd16a93f
Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f am: 6525053801" into oc-dr1-dev-plus-aosp
2017-06-09 03:01:08 +00:00
jackqdyulei
e062096549
Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
...
am: 6525053801
2017-06-09 03:00:53 +00:00
Android Build Merger (Role)
afa34b1cc4
Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am: bdc0816982" into oc-dr1-dev-plus-aosp
2017-06-09 03:00:46 +00:00
jackqdyulei
b0490baa77
Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
...
am: 424edd3064
2017-06-09 03:00:16 +00:00
Fan Zhang
ab7a0d1619
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
...
am: bdc0816982
2017-06-09 03:00:16 +00:00
jackqdyulei
6525053801
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +00:00
jackqdyulei
424edd3064
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +00:00
TreeHugger Robot
bdc0816982
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
2017-06-09 02:54:32 +00:00
TreeHugger Robot
031b90541f
Merge "Update subtitle for apps in battery settings" into oc-dev
2017-06-09 02:53:36 +00:00
Hugo Benichi
391f3fa30d
Merge "Instrument sign-in-captive-portal button"
2017-06-09 02:42:26 +00:00
Matthew Fritze
d1aeb12ec2
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33 am: d07e14fb5b
...
am: e844588e0e
2017-06-09 01:29:15 +00:00
Matthew Fritze
812ad7b329
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33 am: 824f25320a
...
am: 0514c19273
2017-06-09 01:28:48 +00:00
Matthew Fritze
e844588e0e
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33
...
am: d07e14fb5b
2017-06-09 01:26:29 +00:00
Matthew Fritze
0514c19273
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33
...
am: 824f25320a
2017-06-09 01:25:38 +00:00
Matthew Fritze
d07e14fb5b
Merge "Search results always highlight proper results" into oc-dev
...
am: 2a32cb6a33
2017-06-09 01:23:39 +00:00
Matthew Fritze
824f25320a
Merge "Search results always highlight proper results" into oc-dev
...
am: 2a32cb6a33
2017-06-09 01:23:39 +00:00
TreeHugger Robot
2a32cb6a33
Merge "Search results always highlight proper results" into oc-dev
2017-06-09 01:19:38 +00:00
Doris Ling
24ab7be89f
Merge "Update text for Languages & Input." into oc-dr1-dev am: 73e03e6ca2
...
am: 94fa9d8f6e
2017-06-09 01:15:38 +00:00
Doris Ling
94fa9d8f6e
Merge "Update text for Languages & Input." into oc-dr1-dev
...
am: 73e03e6ca2
2017-06-09 01:13:36 +00:00
TreeHugger Robot
cfda7bf224
Merge "Increase visibilities in SearchFragment and SearchResutlsAdapter for testing"
2017-06-09 01:10:48 +00:00
TreeHugger Robot
73e03e6ca2
Merge "Update text for Languages & Input." into oc-dr1-dev
2017-06-09 01:09:25 +00:00
TreeHugger Robot
2a91cda85a
Merge "Add intent action to support page"
2017-06-09 01:01:07 +00:00
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
Fan Zhang
7c7f234355
Use support feature provider to provide intro url.
...
Change-Id: I3d2493ec8c84fdc61c04fd63537f959fbd589e98
Fix: 62034077
Test: make RunSettingsRoboTests
2017-06-08 23:34:35 +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
Matthew Fritze
33f3e3f4f7
Search results always highlight proper results
...
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes: 62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
2017-06-08 16:25:52 -07: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
jackqdyulei
dcea4e894e
Update subtitle for apps in battery settings
...
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"
Note that in this case the item screen will show "TIME"
Bug: 62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba
2017-06-08 12:52:48 -07:00
Soroosh Mariooryad
9aad1cd48b
Increase visibilities in SearchFragment and SearchResutlsAdapter for testing
...
Test: RunSettingsRoboTests
Bug: 36867802
Change-Id: I9102d02a5500330ce53e742ecd2084f0e714b830
2017-06-08 12:46:36 -07:00
Maurice Lam
1bf5454f64
Add intent action to support page
...
Test: cd tests/robotests && mma
Bug: 62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
2017-06-08 12:24:25 -07:00
Doris Ling
7e06ed2105
Update text for Languages & Input.
...
- update preference title to include gesture
- if assist gesture is supported, set summary text to reflect assist
status
Change-Id: I79477f331ae447d2505a1519da09886bf07ba1a2
Fix: 62219660
Test: make RunSettingsRoboTests
2017-06-08 12:19:10 -07: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
