PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,481 Commits 1 Branch 0 Tags
e80f1d0789de6cfb902943996652c7c93c2f9898
Commit Graph

43481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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

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
TreeHugger Robot
940630bae1 Merge "Get anomalyType and autoRestriction from config" into pi-dev 2018-03-21 17:46:50 +00:00
TreeHugger Robot
3749a8d871 Merge "Update material_deep_teal_500 to #008577." into pi-dev 2018-03-21 17:45:25 +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
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
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
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
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
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
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
Lei Yu
291a640420 Merge "Add log for battery tip action." into pi-dev 
am: 09ed2f2596

Change-Id: I4ba9fd91330415ed0f77bb3e4dcd19f47ce2090f
 2018-03-20 23:37:52 +00:00
TreeHugger Robot
f663d78436 Merge "Index SliceType and Official Platform flag" into pi-dev 2018-03-20 23:31:03 +00:00
Maggie Wang
b5f4aa911a Merge "Add an Advanced button to location settings" into pi-dev 
am: ff912223b7

Change-Id: Iaa51d5f9c3e2e4785183f667b47391a652089d60
 2018-03-20 23:28:01 +00:00
TreeHugger Robot
83c8451266 Merge "Remove battery saver toggle from the Battery screen" into pi-dev 2018-03-20 23:21:17 +00:00
Tony Mak
e33a04e278 Merge "Fix user id is not used correctly when fetching app info" into pi-dev 
am: ea43e8285e

Change-Id: I11bd697b6243bfe85617d9edadf680d7c35e1427
 2018-03-20 22:56:51 +00:00
Ben Lin
048b71a67c Merge "Add Default backup page to list of allowed fragments." into pi-dev 2018-03-20 22:22:18 +00:00