Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
2018-03-21 23:01:26 +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
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
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
Beverly
5ac189038a
Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev
...
am: a2f2371224
2018-03-21 21:13:01 +00: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
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
TreeHugger Robot
757b3d48e3
Merge "Correct typo for "Redirect vibration"" into pi-dev
2018-03-21 19:03:53 +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
TreeHugger Robot
940630bae1
Merge "Get anomalyType and autoRestriction from config" into pi-dev
2018-03-21 17:46:50 +00:00
Lei Yu
687964cf28
Add search index provider for bt page
...
1. Implement the search index provider for
ConnectedDeviceDashboardFragment.
2. Since in SEARCH_INDEX_DATA_PROVIDER fragment is null,
so we need to pass in context to all components
instead of getting it from fragment.
3. Update test for it as well as creating new shadow.
Change-Id: If0aa67d5b6ca207c6b728c8355581bf414577091
Fixes: 69333961
Test: RunSettingsRoboTests
2018-03-21 10:46:02 -07:00
TreeHugger Robot
3749a8d871
Merge "Update material_deep_teal_500 to #008577." into pi-dev
2018-03-21 17:45:25 +00:00
Salvador Martinez
6ddc4b4996
Update AP preference to not be master switch pref
...
People keep getting confused by the master switch preference for
wireless tethering. The wireless tethering page already has a switch
so this just removes it from the preference and has it take you to
the page when tapped on instead.
Bug: 69423941
Test: robotests
Change-Id: I66d6d3271e83b49ae77f203e7892438d27f96025
2018-03-21 10:36:56 -07:00
TreeHugger Robot
61e6b87e7d
Merge "Recover print job ID from intent extras" into pi-dev
2018-03-21 17:29:35 +00:00
TreeHugger Robot
346a36cd2e
Merge "Modify connectivty related strings" into pi-dev
2018-03-21 17:14:20 +00:00
Fan Zhang
10420706e6
Merge "Remove SettingsLaunchPerformance test" into pi-dev
2018-03-21 16:53:47 +00:00
Jan Nordqvist
19375adb5a
Only show mobile data usage information when mobile data is enabled.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4eb774120cbcf50f40d22c7c8c3caeb0eacbbed3
2018-03-21 09:13:02 -07:00
Pavel Grafov
35b901c97f
Merge "Move work profile notification settings to the bottom." into pi-dev
...
am: d174ceb27b
2018-03-21 15:26:37 +00:00
Yohei Yukawa
e61ce6008b
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
...
am: cb601396d4
2018-03-21 15:21:01 +00:00
Philip P. Moltmann
b85ab7e979
Recover print job ID from intent extras
...
If the fragment was started via ACTION_PRINT_SETTINGS the intent extra
does not get transformed into a fragment argument. Hence need to check
the intent extra.
Fixes: 74456525
Test: Opened print job settings from a print notification,
atest com.android.settings.print.PrintJobSettingsActivityTest
Change-Id: I6c4605309c348456a862c4d7b48a11400b62fb70
2018-03-21 08:13:45 -07:00
TreeHugger Robot
d174ceb27b
Merge "Move work profile notification settings to the bottom." into pi-dev
2018-03-21 15:01:33 +00:00
TreeHugger Robot
cb601396d4
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
2018-03-21 15:01:11 +00:00
Ben Lin
f3f2a2065e
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
...
am: b8dec9c8a9
2018-03-21 06:59:53 +00:00
Fengjen Wu
f727a0ab12
Merge "Add divider line in Multiple users screen" into pi-dev
...
am: 1a7e4daa95
2018-03-21 06:37:17 +00:00
Shawn Ding
ddf17c73bb
Merge "Update string for "Use vibrator" setting" into pi-dev
...
am: c5491014ab
2018-03-21 06:32:18 +00:00
Bill Yi
60587b45b1
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
...
am: 265e3da2f3
2018-03-21 06:27:18 +00:00
Will Chen
d86798231d
Merge "Remove period on "Fingerprint added" screen" into pi-dev
...
am: f61edcc7f8
2018-03-21 06:23:34 +00:00
Jan Nordqvist
dd5deaa0e3
Merge "Remove the overflow menu from the usage Appbar." into pi-dev
...
am: 09d1588a07
2018-03-21 06:18:12 +00:00
Jan Nordqvist
2adf86a3c7
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
...
am: 9055c1b655
2018-03-21 06:09:52 +00:00
Ben Lin
b8dec9c8a9
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
2018-03-21 06:07:45 +00:00
Fan Zhang
e435f2cd1e
Merge "Remove hardcoded wrong summary" into pi-dev
...
am: f089fb2413
2018-03-21 05:30:32 +00:00
Shawn Ding
55554c4eb1
Correct typo for "Redirect vibration"
...
The string is "vibration" , not "vibrator".
Fixes: 75277798
Test: Manual test
Change-Id: I065f4f556e9b719b89b0abeca709ebdcc53b3321
2018-03-21 12:53:28 +08:00
Fengjen Wu
1a7e4daa95
Merge "Add divider line in Multiple users screen" into pi-dev
2018-03-21 03:21:12 +00:00
TreeHugger Robot
c5491014ab
Merge "Update string for "Use vibrator" setting" into pi-dev
2018-03-21 03:18:04 +00:00
TreeHugger Robot
265e3da2f3
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
2018-03-21 03:06:10 +00:00
