Lei Yu
2eb69b56ed
Merge "Only show restricted apps that belong to the user." into pi-dev am: 5464549257
...
am: ad1549b54d
Change-Id: I34c2fc249d821521c6ce9333e9b9815a51c373cd
2018-03-22 04:42:34 +00:00
Lei Yu
ad1549b54d
Merge "Only show restricted apps that belong to the user." into pi-dev
...
am: 5464549257
Change-Id: I2ed5deddf64535fdabce58e70d07b4fc537af7b1
2018-03-22 04:36:06 +00:00
TreeHugger Robot
5464549257
Merge "Only show restricted apps that belong to the user." into pi-dev
2018-03-22 04:31:38 +00:00
WAYNE YANG
a3ede6d515
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev am: 2d230e1431
...
am: 800a8dcb9a
Change-Id: I51118fe1fa87de71f63ace8aede0deb077b68ac3
2018-03-22 04:14:26 +00:00
WAYNE YANG
800a8dcb9a
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev
...
am: 2d230e1431
Change-Id: Ic35475537f0764b442142b32fc4d29e7771890cd
2018-03-22 04:07:56 +00:00
WAYNE YANG
2d230e1431
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev
2018-03-22 03:56:41 +00:00
Jan Nordqvist
13fd8bef8a
Merge "Fix entity header to "Hide" shadow of app bar unless scrolled." into pi-dev am: 58a8b09e7b
...
am: cc7a739e6b
Change-Id: I05c5a8a99249f7bc68d6a585d6a877e166d1528c
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
Change-Id: I553f866eb38cf8831250226bdec3a6d182018299
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
Change-Id: Ied53957deefc6ffb7e5cfb363c2a8ff7ffbd14d4
2018-03-22 03:11:57 +00:00
Sundeep Ghuman
4166aa0757
Merge "Modify "Updated ..." text." into pi-dev
...
am: 119d95bae1
Change-Id: If1b339d684f14d76427a6830d0c5eb3d95a74488
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
wayneyang
77f5ad5c4a
Fix "Send feedback about this device" option is missing issue.
...
When device restart & launching "Feedback" from lock screen,
the "send feedback" option will be missing. It's because
the report package cannot be found by calling from lock screen.
Update the option visibility after updatestate and add test case.
Bug: 74076963
Test: Manual test and RunSettingsRoboTests:FeedbackPreferenceControllerTest
Change-Id: I105d6f90da499423b6881f2ba808e69bd2e8595d
2018-03-22 09:56:28 +08:00
Bill Yi
21101618c6
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev am: 4ed1ed2465
-s ours
...
am: 8773378779
-s ours
Change-Id: I3eff05cbd0a5c3836a6e66e0e989b26c33cca77b
2018-03-22 01:36:09 +00:00
Bill Yi
8773378779
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 4ed1ed2465
-s ours
Change-Id: Ibd43f7f6411e36a18168e71561867fd570cce9bd
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
Change-Id: I01708c4ea069c104d73e3a986b6cd8790289cfce
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
Change-Id: I1a17b42feb14fa436e88a6d46f570a7001dbd945
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
Change-Id: If5aefaaea5c9f38cc8d395ace3028885c8331436
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
Change-Id: Ia173dfe64eda2148e5d8d17f8708ab788b2c68e0
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
Change-Id: I7b7940b4a14b342627e7e3aa623fed0aee9fdf95
2018-03-21 23:22:21 +00:00
Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
Change-Id: I19ed4d100add055cf280d6c704c1e148a722f92e
2018-03-21 23:01:26 +00:00
Shawn Ding
5939fd8360
Merge "Correct typo for "Redirect vibration"" into pi-dev am: 757b3d48e3
...
am: e80f1d0789
Change-Id: I2ff1aebad47bdb583d9142c8fe91444b6b070490
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
Change-Id: I403368f2add65cc5a1a7bd4b1b2be3166a750464
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
Lei Yu
37d29ee6a6
Only show restricted apps that belong to the user.
...
Filter out the restricted apps that not belong to the correct user, in
this way secondary user cannot see what apps been restricted by primary
user.
Bug: 74076658
Test: RunSettingsRoboTests
Change-Id: I8471f07be747c177f8611cdc1973a8420dc41296
2018-03-21 15:27:14 -07: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
Change-Id: Idc51212789748a1fcb1965a7bee376d915588fd4
2018-03-21 22:15:37 +00:00
Beverly
0de725fa83
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev am: a2f2371224
...
am: 5ac189038a
Change-Id: I585f8fd7bcce2f103b65e88b03459c13acfe5b68
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
Change-Id: Ia06828d5c36f14cc419800bba15f376c3701b917
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
Change-Id: I0e9389e086086dc511f6b702bf042fec55dbd534
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
Change-Id: I873cd92bd6fd2eeacf511dcba2a95a0548ea4033
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
Change-Id: If32dafaf7d02bc18f9347513bac0aff68be0be06
2018-03-21 21:43:14 +00:00
Beverly
5ac189038a
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev
...
am: a2f2371224
Change-Id: I197a877a4a9a886b0238b7b43138fffda62d0563
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
Change-Id: I43e8737adbcaa91069499b87ed65075e4c07cb1a
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
Change-Id: Iaf0496e019eb62dbeca2b7eaacea1cbff744c6be
2018-03-21 19:39:15 +00:00
Lei Yu
ca5e641d0b
Merge "Get anomalyType and autoRestriction from config" into pi-dev
...
am: 940630bae1
Change-Id: I7742c6b7892fee14f56439af88f9fdd7a07dcb80
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
Change-Id: Ie8d15a1efdd54a2b35c38391ee1860a832cd7cbb
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
Change-Id: Id4ae32070d679616a52c02fadb9ce97ef9ae3fc1
2018-03-21 19:20:37 +00:00
Jyun LuoLai
6ae743f957
Merge "Modify connectivty related strings" into pi-dev am: 346a36cd2e
...
am: 73af1f3fb7
Change-Id: Ib8da644dc0c84ddb2d0133643de6325c0fbdc2c2
2018-03-21 19:20:10 +00:00
Fan Zhang
1f96cd453e
Merge "Remove SettingsLaunchPerformance test" into pi-dev am: 10420706e6
...
am: 2049dbcb8a
Change-Id: If0227ec0cef584a784f636052131ffe066adae09
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