Commit Graph

44048 Commits

Author SHA1 Message Date
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

Change-Id: I7892793d65ec47e25141c0d4cbe1aade8caf9843
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

Change-Id: If6a4b87329463abd1aaf833c3cfd73147765c5a6
2018-03-21 18:43:53 +00:00
Jyun LuoLai
73af1f3fb7 Merge "Modify connectivty related strings" into pi-dev
am: 346a36cd2e

Change-Id: Ia49102de0aa3a881ae69d43ec3612d1e17e5562a
2018-03-21 18:43:26 +00:00
Fan Zhang
2049dbcb8a Merge "Remove SettingsLaunchPerformance test" into pi-dev
am: 10420706e6

Change-Id: Ie676d8937586f03a59179a1799be5d06685177f6
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
10bf42df11 Merge "Fix renaming for Bluetooth devices when rotating to landscape" 2018-03-21 17:30:23 +00: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
arangelov
75c603cedb Show policy transparency popup dialog for Bluetooth in Settings.
Bug: 70206452
Test: make ROBOTEST_FILTER=BluetoothEnablerTest -j40 RunSettingsRobotests
Test: make ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest -j40 RunSettingsRobotests
Change-Id: I543cf69b754c44b02c66e101698f10906a1b957f
2018-03-21 16:03:28 +00:00
Pavel Grafov
d05988a043 Merge "Move work profile notification settings to the bottom." into pi-dev am: d174ceb27b
am: 35b901c97f

Change-Id: I50c2899490f8250a11759b37fbd83095561bc433
2018-03-21 15:40:02 +00:00
Yohei Yukawa
95f340df54 Merge "Logically revert "Directly show the layout selection screen."" into pi-dev am: cb601396d4
am: e61ce6008b

Change-Id: I494033055ba2d49ef46a818123edad2a064fe333
2018-03-21 15:34:59 +00:00
Pavel Grafov
35b901c97f Merge "Move work profile notification settings to the bottom." into pi-dev
am: d174ceb27b

Change-Id: I25f852eba45c4a2f3c0106f425e3f02a82600951
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

Change-Id: I4ed2afd0c84e3419a598612653c7347978a2e9f8
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
91c902c8c8 Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev am: b8dec9c8a9
am: f3f2a2065e

Change-Id: I43708fd8b56ce20ae591b5bb28abc0e3d611138a
2018-03-21 09:41:11 +00:00
Fengjen Wu
63cb104551 Merge "Add divider line in Multiple users screen" into pi-dev am: 1a7e4daa95
am: f727a0ab12

Change-Id: Icb403030444e866ea6ecb9f9d315d88e017a5324
2018-03-21 09:40:35 +00:00
Shawn Ding
b9260ae13e Merge "Update string for "Use vibrator" setting" into pi-dev am: c5491014ab
am: ddf17c73bb

Change-Id: I98ef7c8c7df7bbcd752b5981c4cf7abe1194ba41
2018-03-21 09:40:08 +00:00
Bill Yi
003f52fcac Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev am: 265e3da2f3 -s ours
am: 60587b45b1  -s ours

Change-Id: Ia39721fe6998f508634afdd9dc6b468d1958d638
2018-03-21 09:39:42 +00:00
Will Chen
0e8431d1b9 Merge "Remove period on "Fingerprint added" screen" into pi-dev am: f61edcc7f8
am: d86798231d

Change-Id: Ice9e83584f10e8ccc7ff5ad9a005469d28f20f24
2018-03-21 09:39:31 +00:00
Jan Nordqvist
bda38c3823 Merge "Remove the overflow menu from the usage Appbar." into pi-dev am: 09d1588a07
am: dd5deaa0e3

Change-Id: I6b2d697cfa634303ce0799ce6c245e3edaaf10a9
2018-03-21 09:39:03 +00:00
Jan Nordqvist
b58ae73c15 Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev am: 9055c1b655
am: 2adf86a3c7

Change-Id: Ic2b220414331ee842f5042d5a078aa40463a74cd
2018-03-21 09:38:22 +00:00
Fan Zhang
eeae927349 Merge "Remove hardcoded wrong summary" into pi-dev am: f089fb2413
am: e435f2cd1e

Change-Id: I4c7eea0c6507d4afae7b385d7b073df0e6cc1595
2018-03-21 08:30:10 +00:00
leo huang
b7896fca3e Align email provider correctly for RTL locales
Align email provider under User & accounts correctly for RTL locales

Bug: 72398295
Test: Robotest and manual test
Change-Id: I0ecbaa58366c01a75fc7ff4e2adbfba97ddc4add
2018-03-21 16:14:19 +08:00
Ben Lin
f3f2a2065e Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
am: b8dec9c8a9

Change-Id: I88883b9e2a0bf07e4dbb401649420a455f92825b
2018-03-21 06:59:53 +00:00
Fengjen Wu
f727a0ab12 Merge "Add divider line in Multiple users screen" into pi-dev
am: 1a7e4daa95

Change-Id: I06851ac8b0f02f780b709f2f4983b9aa3ac8c3a0
2018-03-21 06:37:17 +00:00
Shawn Ding
ddf17c73bb Merge "Update string for "Use vibrator" setting" into pi-dev
am: c5491014ab

Change-Id: Ie0c85eda717af5d824cd1620ee3a34c03ce024a7
2018-03-21 06:32:18 +00:00
Bill Yi
60587b45b1 Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
am: 265e3da2f3  -s ours

Change-Id: Ib71ce37aa55b7e02c39bdcd833c94d1a15fe2381
2018-03-21 06:27:18 +00:00
Will Chen
d86798231d Merge "Remove period on "Fingerprint added" screen" into pi-dev
am: f61edcc7f8

Change-Id: I22bf9f50826e987f6fa1b7b1b4bda81b087c9ccb
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

Change-Id: I0e3816f118905c0bd47c20c11771749f682068fa
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

Change-Id: Idcfa145e0a1e159232dc8c979ab3896926ca7a69
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

Change-Id: I0df852825f986d31dffcbece49ce23675f84335c
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
Matthew Fritze
527be21e9b Merge "Index SliceType and Official Platform flag" into pi-dev am: f663d78436
am: 467b47be5f

Change-Id: I34e60b72206616d4c569869ac8416972aa30c5ce
2018-03-21 04:33:12 +00:00
Makoto Onuki
3b4cd7410b Merge "Remove battery saver toggle from the Battery screen" into pi-dev am: 83c8451266
am: 2ef1dcafa5

Change-Id: I776a51b5918991f7825b588cbbaf74d31c712d4d
2018-03-21 04:20:40 +00:00
Ben Lin
8557c55e7b Merge "Add Default backup page to list of allowed fragments." into pi-dev am: 048b71a67c
am: 4ff1e8fce2

Change-Id: I4a5bfd0005009e5052d9ccb5409bda4dcd07721c
2018-03-21 04:06:29 +00: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