Andrew Sapperstein
23fbc3acf9
Merge "Update material_deep_teal_500 to #008577." into pi-dev am: 3749a8d871
...
am: 4b6cdc6b04
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
2018-03-21 19:20:37 +00:00
Jyun LuoLai
6ae743f957
Merge "Modify connectivty related strings" into pi-dev am: 346a36cd2e
...
am: 73af1f3fb7
2018-03-21 19:20:10 +00:00
Fan Zhang
1f96cd453e
Merge "Remove SettingsLaunchPerformance test" into pi-dev am: 10420706e6
...
am: 2049dbcb8a
2018-03-21 19:19:42 +00:00
TreeHugger Robot
ce5bed1366
Merge "Import translations. DO NOT MERGE"
2018-03-21 18:52:29 +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
3749a8d871
Merge "Update material_deep_teal_500 to #008577." into pi-dev
2018-03-21 17:45:25 +00: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
Pavel Grafov
d05988a043
Merge "Move work profile notification settings to the bottom." into pi-dev am: d174ceb27b
...
am: 35b901c97f
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
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
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
91c902c8c8
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev am: b8dec9c8a9
...
am: f3f2a2065e
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
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
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
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
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
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
2018-03-21 09:38:22 +00:00
Fan Zhang
eeae927349
Merge "Remove hardcoded wrong summary" into pi-dev am: f089fb2413
...
am: e435f2cd1e
2018-03-21 08:30:10 +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
Matthew Fritze
527be21e9b
Merge "Index SliceType and Official Platform flag" into pi-dev am: f663d78436
...
am: 467b47be5f
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
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
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
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
2018-03-21 01:54:51 +00:00
Lei Yu
2d6cddb172
Merge "Add log for battery tip action." into pi-dev am: 09ed2f2596
...
am: 291a640420
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
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
2018-03-21 01:11:13 +00:00
