Jan Nordqvist
13fd8bef8a
Merge "Fix entity header to "Hide" shadow of app bar unless scrolled." into pi-dev am: 58a8b09e7b
...
am: cc7a739e6b
2018-03-22 03:43:55 +00:00
Jan Nordqvist
cc7a739e6b
Merge "Fix entity header to "Hide" shadow of app bar unless scrolled." into pi-dev
...
am: 58a8b09e7b
2018-03-22 03:31:15 +00:00
TreeHugger Robot
58a8b09e7b
Merge "Fix entity header to "Hide" shadow of app bar unless scrolled." into pi-dev
2018-03-22 03:17:29 +00:00
Sundeep Ghuman
372a7996fd
Merge "Modify "Updated ..." text." into pi-dev am: 119d95bae1
...
am: 4166aa0757
2018-03-22 03:11:57 +00:00
Sundeep Ghuman
4166aa0757
Merge "Modify "Updated ..." text." into pi-dev
...
am: 119d95bae1
2018-03-22 03:05:26 +00:00
TreeHugger Robot
119d95bae1
Merge "Modify "Updated ..." text." into pi-dev
2018-03-22 02:58:41 +00:00
Bill Yi
21101618c6
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev am: 4ed1ed2465 -s ours
...
am: 8773378779
2018-03-22 01:36:09 +00:00
Bill Yi
8773378779
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 4ed1ed2465
2018-03-22 00:30:37 +00:00
TreeHugger Robot
4ed1ed2465
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-22 00:23:30 +00:00
Lei Yu
44a327d2a1
Merge "Add string for adaptive brightness" into pi-dev am: 6cc043ba06
...
am: 6619f260db
2018-03-22 00:07:37 +00:00
Makoto Onuki
5f3569b07b
Merge "Implement new BS warning / notification flow (2/2)" into pi-dev am: d2c1b245fc
...
am: db71812bc3
2018-03-21 23:49:42 +00:00
Fan Zhang
dcaa636f29
Merge "Hide spannable link if it's not actionable" into pi-dev am: aebbd5b704
...
am: 51b76810f5
2018-03-21 23:43:06 +00:00
Lei Yu
0861b33763
Merge "Add search index provider for bt page" into pi-dev am: 9492aa546d
...
am: bfc77e7106
2018-03-21 23:33:39 +00:00
Salvador Martinez
69fb4439ed
Merge "Update AP preference to not be master switch pref" into pi-dev am: 24c104a16e
...
am: 81c8c0d80e
2018-03-21 23:22:21 +00:00
Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
2018-03-21 23:01:26 +00:00
Shawn Ding
5939fd8360
Merge "Correct typo for "Redirect vibration"" into pi-dev am: 757b3d48e3
...
am: e80f1d0789
2018-03-21 22:52:20 +00:00
Makoto Onuki
db71812bc3
Merge "Implement new BS warning / notification flow (2/2)" into pi-dev
...
am: d2c1b245fc
2018-03-21 22:51:19 +00:00
Lei Yu
6cc043ba06
Merge "Add string for adaptive brightness" into pi-dev
2018-03-21 22:35:01 +00:00
Makoto Onuki
d2c1b245fc
Merge "Implement new BS warning / notification flow (2/2)" into pi-dev
2018-03-21 22:32:33 +00:00
Sundeep Ghuman
9bfbc3f1fd
Modify "Updated ..." text.
...
Use d/h/m "narrow" time formatting with no period.
Change font style when update is "old."
Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I25902c98eb0fdf4dd2f64c3f5d668b5efdcdff0c
2018-03-21 15:24:43 -07:00
Fan Zhang
51b76810f5
Merge "Hide spannable link if it's not actionable" into pi-dev
...
am: aebbd5b704
2018-03-21 22:15:37 +00:00
Beverly
0de725fa83
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev am: a2f2371224
...
am: 5ac189038a
2018-03-21 22:15:33 +00:00
Jan Nordqvist
ba1c53455a
Fix entity header to "Hide" shadow of app bar unless scrolled.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I3d23ac49365873361f23b0c7ab105f208d6a7ed7
2018-03-21 15:15:10 -07:00
Lei Yu
bfc77e7106
Merge "Add search index provider for bt page" into pi-dev
...
am: 9492aa546d
2018-03-21 22:08:24 +00:00
Salvador Martinez
81c8c0d80e
Merge "Update AP preference to not be master switch pref" into pi-dev
...
am: 24c104a16e
2018-03-21 22:02:04 +00:00
TreeHugger Robot
aebbd5b704
Merge "Hide spannable link if it's not actionable" into pi-dev
2018-03-21 21:55:45 +00:00
Shawn Ding
e80f1d0789
Merge "Correct typo for "Redirect vibration"" into pi-dev
...
am: 757b3d48e3
2018-03-21 21:55:25 +00:00
Jan Nordqvist
bbf1743168
Merge "Only show mobile data usage information when mobile data is enabled." into pi-dev am: d17e849775
...
am: 8e3868e4fe
2018-03-21 21:43:14 +00:00
Beverly
5ac189038a
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev
...
am: a2f2371224
2018-03-21 21:13:01 +00:00
Bill Yi
d12d5cac31
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6cc802e72ebf5753bf7441dc6c9232379d9e17f2
2018-03-21 14:03:26 -07:00
TreeHugger Robot
9492aa546d
Merge "Add search index provider for bt page" into pi-dev
2018-03-21 20:48:41 +00:00
Lei Yu
38585cd4de
Merge "Get anomalyType and autoRestriction from config" into pi-dev am: 940630bae1
...
am: ca5e641d0b
2018-03-21 20:40:35 +00:00
Lei Yu
0cc9a92665
Add string for adaptive brightness
...
Bug: 69795935
Test: Build
Change-Id: If99bd796711f3e77ef5e88533b3a6d683acc54e3
2018-03-21 13:00:15 -07:00
TreeHugger Robot
24c104a16e
Merge "Update AP preference to not be master switch pref" into pi-dev
2018-03-21 19:52:05 +00:00
Jan Nordqvist
8e3868e4fe
Merge "Only show mobile data usage information when mobile data is enabled." into pi-dev
...
am: d17e849775
2018-03-21 19:39:15 +00:00
Lei Yu
ca5e641d0b
Merge "Get anomalyType and autoRestriction from config" into pi-dev
...
am: 940630bae1
2018-03-21 19:38:07 +00:00
Fan Zhang
1ee2a88fd7
Hide spannable link if it's not actionable
...
Created a new constructor that detects if intent is actionable and set a
flag in LinkInfo.
In fragments, first check if linkInfo is actionable, if not, don't do
anything with it.
Change-Id: Ibda12ecac2545d696acc7c197fc315e423b984aa
Fixes: 74726487
Test: make RunSettingsRoboTests -j
2018-03-21 12:37:34 -07:00
Andrew Sapperstein
23fbc3acf9
Merge "Update material_deep_teal_500 to #008577." into pi-dev am: 3749a8d871
...
am: 4b6cdc6b04
2018-03-21 19:21:12 +00:00
Philip P. Moltmann
b88b260227
Merge "Recover print job ID from intent extras" into pi-dev am: 61e6b87e7d
...
am: 57a64606da
2018-03-21 19:20:37 +00:00
Jyun LuoLai
6ae743f957
Merge "Modify connectivty related strings" into pi-dev am: 346a36cd2e
...
am: 73af1f3fb7
2018-03-21 19:20:10 +00:00
Fan Zhang
1f96cd453e
Merge "Remove SettingsLaunchPerformance test" into pi-dev am: 10420706e6
...
am: 2049dbcb8a
2018-03-21 19:19:42 +00:00
TreeHugger Robot
757b3d48e3
Merge "Correct typo for "Redirect vibration"" into pi-dev
2018-03-21 19:03:53 +00:00
TreeHugger Robot
ce5bed1366
Merge "Import translations. DO NOT MERGE"
2018-03-21 18:52:29 +00:00
TreeHugger Robot
a2f2371224
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev
2018-03-21 18:44:56 +00:00
Andrew Sapperstein
4b6cdc6b04
Merge "Update material_deep_teal_500 to #008577." into pi-dev
...
am: 3749a8d871
2018-03-21 18:44:38 +00:00
Philip P. Moltmann
57a64606da
Merge "Recover print job ID from intent extras" into pi-dev
...
am: 61e6b87e7d
2018-03-21 18:43:53 +00:00
Jyun LuoLai
73af1f3fb7
Merge "Modify connectivty related strings" into pi-dev
...
am: 346a36cd2e
2018-03-21 18:43:26 +00:00
Fan Zhang
2049dbcb8a
Merge "Remove SettingsLaunchPerformance test" into pi-dev
...
am: 10420706e6
2018-03-21 18:42:56 +00:00
TreeHugger Robot
d17e849775
Merge "Only show mobile data usage information when mobile data is enabled." into pi-dev
2018-03-21 18:29:21 +00:00
Makoto Onuki
5b60fdba81
Implement new BS warning / notification flow (2/2)
...
Bug: 74120126
Test: Manual tests
Change-Id: Ieea6ee97695cd5a30e55f5c6ccec8135ec2d0ef4
2018-03-21 11:14:20 -07:00
