Commit Graph

44381 Commits

Author SHA1 Message Date
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
TreeHugger Robot
265e3da2f3 Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev 2018-03-21 03:06:10 +00:00
Will Chen
f61edcc7f8 Merge "Remove period on "Fingerprint added" screen" into pi-dev 2018-03-21 02:04:37 +00:00
Matthew Fritze
467b47be5f Merge "Index SliceType and Official Platform flag" into pi-dev
am: f663d78436

Change-Id: I9c8743ed0f999a91b4c3c9a4491d4dc9adcae9b5
2018-03-21 02:03:35 +00:00
anitalin
a08e2720c6 Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings
Bug: 73775027
Test: Robotest and manual test
Change-Id: Ifdec1c2a9b8ce34007ee468ada3f8449005d3263
2018-03-21 02:02:35 +00:00
Makoto Onuki
2ef1dcafa5 Merge "Remove battery saver toggle from the Battery screen" into pi-dev
am: 83c8451266

Change-Id: Ic1301830b736cbbd29aafcbbfe27e8ac7aa4b15c
2018-03-21 01:54:51 +00:00
Jyun LuoLai
11960ce2ce Fix PATTERN UI to align PIN&PASSWORD screen
Change-Id: I475e90ab11a9821fc21623dcfdd3854914a7eb04
Fixes: 69002501
Test: Manual test & make RunSettingsRoboTests
2018-03-21 09:36:50 +08:00
Lei Yu
2d6cddb172 Merge "Add log for battery tip action." into pi-dev am: 09ed2f2596
am: 291a640420

Change-Id: I44961a0446549c799a9852b97e8d1a36589b742f
2018-03-21 01:21:36 +00:00
Ben Lin
4ff1e8fce2 Merge "Add Default backup page to list of allowed fragments." into pi-dev
am: 048b71a67c

Change-Id: Ib89ba0f96f650f36cc5286ce48e0bd0df1d79ad5
2018-03-21 01:18:44 +00:00
Maggie Wang
21f9b47884 Merge "Add an Advanced button to location settings" into pi-dev am: ff912223b7
am: b5f4aa911a

Change-Id: Ifc4523cb11346ae14f58940ca003946ed0efa055
2018-03-21 01:11:13 +00:00
Tony Mak
1b8ee6f122 Merge "Fix user id is not used correctly when fetching app info" into pi-dev am: ea43e8285e
am: e33a04e278

Change-Id: I5ff962974f3131724b5d486747b532d037fefc67
2018-03-21 00:53:18 +00:00
Lei Yu
baf8a0cf9e Get anomalyType and autoRestriction from config
Now the westworld config provides COOKIES to store private info
for each alert(anomaly). So we could use it to store:
1. AnomalyType: what is the type of anomaly
2. AutoRestriction: whether to auto restrict this anomaly

Bug: 74567790
Test: RunSettingsRoboTests
Change-Id: I15f5e225a4cb1f2da3fe109e56e5222816d179cc
2018-03-20 17:50:44 -07:00
TreeHugger Robot
09d1588a07 Merge "Remove the overflow menu from the usage Appbar." into pi-dev 2018-03-21 00:44:09 +00:00
TreeHugger Robot
9055c1b655 Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev 2018-03-21 00:39:20 +00:00
Bill Yi
836ccd1b95 Revert "Import translations. DO NOT MERGE"
This reverts commit 5b57d1d1cb.

Reason for revert: deleted AS and OR locales

BUG:76032849

Change-Id: I199238e3111c6917cf2db8e088070a90618841fb
2018-03-21 00:35:50 +00:00
TreeHugger Robot
f089fb2413 Merge "Remove hardcoded wrong summary" into pi-dev 2018-03-21 00:28:52 +00:00
Phil Weaver
118c2b0d1c Merge "Indicate when accessibility services have stopped" into pi-dev am: 656aad9c93
am: 9eb8ba1b6f

Change-Id: Ia3ac5272b73c404fb2ae36f34654d12a7fd8006a
2018-03-21 00:06:20 +00:00
Salvador Martinez
457f75a139 Merge "Update metered string" into pi-dev am: f9dade022c
am: b07afe0538

Change-Id: I23f628dd65088a01a980f2ba278945e1bf92e903
2018-03-21 00:05:45 +00:00