Sean Callanan
e8f9bf5f68
[Settings] Add strings for Natural and Automatic color modes
...
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
2018-03-22 13:05:32 -07:00
TreeHugger Robot
10bf42df11
Merge "Fix renaming for Bluetooth devices when rotating to landscape"
2018-03-21 17:30:23 +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
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
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
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
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
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
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
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
Antony Sargent
5a1587526b
Fix renaming for Bluetooth devices when rotating to landscape
...
The bug here is that when renaming a Bluetooth device (either the local
adapter or a paired device), if you click on the text edit field of the
alert dialog and then rotate the screen, the text shown in the soft
input will disappear. Also it's a usability problem that you even needed
to click in the first place. This CL fixes both problems - now the soft
input will be shown immediately when the dialog comes up, and the
content doesn't disappear on rotation.
Change-Id: Id29d11c834bf98c01b5c1208159537a8fd36a64f
Fixes: 72551780
Test: make -j RunSettingsRoboTests
2018-03-20 16:33:26 -07: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
Hansong Zhang
97128f86d6
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev am: 012e04fa02
...
am: fbd3076a84
Change-Id: I523108fe5442cad7d9daac1331b58ebfa650600e
2018-03-20 23:23:18 +00:00
Antoan Angelov
92cc5fa977
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev am: 1bc98edc15
...
am: 2465019035
Change-Id: Ia7f4d752de8ceabac2379975b235ba21e046f415
2018-03-20 23:22:40 +00:00