OSDN Git Service
Pavel Grafov [Wed, 21 Mar 2018 15:40:02 +0000 (15:40 +0000)]
Merge "Move work profile notification settings to the bottom." into pi-dev am:
d174ceb27b
am:
35b901c97f
Change-Id: I50c2899490f8250a11759b37fbd83095561bc433
Yohei Yukawa [Wed, 21 Mar 2018 15:34:59 +0000 (15:34 +0000)]
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev am:
cb601396d4
am:
e61ce6008b
Change-Id: I494033055ba2d49ef46a818123edad2a064fe333
Pavel Grafov [Wed, 21 Mar 2018 15:26:37 +0000 (15:26 +0000)]
Merge "Move work profile notification settings to the bottom." into pi-dev
am:
d174ceb27b
Change-Id: I25f852eba45c4a2f3c0106f425e3f02a82600951
Yohei Yukawa [Wed, 21 Mar 2018 15:21:01 +0000 (15:21 +0000)]
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
am:
cb601396d4
Change-Id: I4ed2afd0c84e3419a598612653c7347978a2e9f8
TreeHugger Robot [Wed, 21 Mar 2018 15:01:33 +0000 (15:01 +0000)]
Merge "Move work profile notification settings to the bottom." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 15:01:11 +0000 (15:01 +0000)]
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
Ben Lin [Wed, 21 Mar 2018 09:41:11 +0000 (09:41 +0000)]
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev am:
b8dec9c8a9
am:
f3f2a2065e
Change-Id: I43708fd8b56ce20ae591b5bb28abc0e3d611138a
Fengjen Wu [Wed, 21 Mar 2018 09:40:35 +0000 (09:40 +0000)]
Merge "Add divider line in Multiple users screen" into pi-dev am:
1a7e4daa95
am:
f727a0ab12
Change-Id: Icb403030444e866ea6ecb9f9d315d88e017a5324
Shawn Ding [Wed, 21 Mar 2018 09:40:08 +0000 (09:40 +0000)]
Merge "Update string for "Use vibrator" setting" into pi-dev am:
c5491014ab
am:
ddf17c73bb
Change-Id: I98ef7c8c7df7bbcd752b5981c4cf7abe1194ba41
Bill Yi [Wed, 21 Mar 2018 09:39:42 +0000 (09:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev am:
265e3da2f3 -s ours
am:
60587b45b1 -s ours
Change-Id: Ia39721fe6998f508634afdd9dc6b468d1958d638
Will Chen [Wed, 21 Mar 2018 09:39:31 +0000 (09:39 +0000)]
Merge "Remove period on "Fingerprint added" screen" into pi-dev am:
f61edcc7f8
am:
d86798231d
Change-Id: Ice9e83584f10e8ccc7ff5ad9a005469d28f20f24
Jan Nordqvist [Wed, 21 Mar 2018 09:39:03 +0000 (09:39 +0000)]
Merge "Remove the overflow menu from the usage Appbar." into pi-dev am:
09d1588a07
am:
dd5deaa0e3
Change-Id: I6b2d697cfa634303ce0799ce6c245e3edaaf10a9
Jan Nordqvist [Wed, 21 Mar 2018 09:38:22 +0000 (09:38 +0000)]
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev am:
9055c1b655
am:
2adf86a3c7
Change-Id: Ic2b220414331ee842f5042d5a078aa40463a74cd
Fan Zhang [Wed, 21 Mar 2018 08:30:10 +0000 (08:30 +0000)]
Merge "Remove hardcoded wrong summary" into pi-dev am:
f089fb2413
am:
e435f2cd1e
Change-Id: I4c7eea0c6507d4afae7b385d7b073df0e6cc1595
Ben Lin [Wed, 21 Mar 2018 06:59:53 +0000 (06:59 +0000)]
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
am:
b8dec9c8a9
Change-Id: I88883b9e2a0bf07e4dbb401649420a455f92825b
Fengjen Wu [Wed, 21 Mar 2018 06:37:17 +0000 (06:37 +0000)]
Merge "Add divider line in Multiple users screen" into pi-dev
am:
1a7e4daa95
Change-Id: I06851ac8b0f02f780b709f2f4983b9aa3ac8c3a0
Shawn Ding [Wed, 21 Mar 2018 06:32:18 +0000 (06:32 +0000)]
Merge "Update string for "Use vibrator" setting" into pi-dev
am:
c5491014ab
Change-Id: Ie0c85eda717af5d824cd1620ee3a34c03ce024a7
Bill Yi [Wed, 21 Mar 2018 06:27:18 +0000 (06:27 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
am:
265e3da2f3 -s ours
Change-Id: Ib71ce37aa55b7e02c39bdcd833c94d1a15fe2381
Will Chen [Wed, 21 Mar 2018 06:23:34 +0000 (06:23 +0000)]
Merge "Remove period on "Fingerprint added" screen" into pi-dev
am:
f61edcc7f8
Change-Id: I22bf9f50826e987f6fa1b7b1b4bda81b087c9ccb
Jan Nordqvist [Wed, 21 Mar 2018 06:18:12 +0000 (06:18 +0000)]
Merge "Remove the overflow menu from the usage Appbar." into pi-dev
am:
09d1588a07
Change-Id: I0e3816f118905c0bd47c20c11771749f682068fa
Jan Nordqvist [Wed, 21 Mar 2018 06:09:52 +0000 (06:09 +0000)]
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
am:
9055c1b655
Change-Id: Idcfa145e0a1e159232dc8c979ab3896926ca7a69
Ben Lin [Wed, 21 Mar 2018 06:07:45 +0000 (06:07 +0000)]
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
Fan Zhang [Wed, 21 Mar 2018 05:30:32 +0000 (05:30 +0000)]
Merge "Remove hardcoded wrong summary" into pi-dev
am:
f089fb2413
Change-Id: I0df852825f986d31dffcbece49ce23675f84335c
Matthew Fritze [Wed, 21 Mar 2018 04:33:12 +0000 (04:33 +0000)]
Merge "Index SliceType and Official Platform flag" into pi-dev am:
f663d78436
am:
467b47be5f
Change-Id: I34e60b72206616d4c569869ac8416972aa30c5ce
Makoto Onuki [Wed, 21 Mar 2018 04:20:40 +0000 (04:20 +0000)]
Merge "Remove battery saver toggle from the Battery screen" into pi-dev am:
83c8451266
am:
2ef1dcafa5
Change-Id: I776a51b5918991f7825b588cbbaf74d31c712d4d
Ben Lin [Wed, 21 Mar 2018 04:06:29 +0000 (04:06 +0000)]
Merge "Add Default backup page to list of allowed fragments." into pi-dev am:
048b71a67c
am:
4ff1e8fce2
Change-Id: I4a5bfd0005009e5052d9ccb5409bda4dcd07721c
Fengjen Wu [Wed, 21 Mar 2018 03:21:12 +0000 (03:21 +0000)]
Merge "Add divider line in Multiple users screen" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 03:18:04 +0000 (03:18 +0000)]
Merge "Update string for "Use vibrator" setting" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 03:06:10 +0000 (03:06 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
Will Chen [Wed, 21 Mar 2018 02:04:37 +0000 (02:04 +0000)]
Merge "Remove period on "Fingerprint added" screen" into pi-dev
Matthew Fritze [Wed, 21 Mar 2018 02:03:35 +0000 (02:03 +0000)]
Merge "Index SliceType and Official Platform flag" into pi-dev
am:
f663d78436
Change-Id: I9c8743ed0f999a91b4c3c9a4491d4dc9adcae9b5
Makoto Onuki [Wed, 21 Mar 2018 01:54:51 +0000 (01:54 +0000)]
Merge "Remove battery saver toggle from the Battery screen" into pi-dev
am:
83c8451266
Change-Id: Ic1301830b736cbbd29aafcbbfe27e8ac7aa4b15c
Lei Yu [Wed, 21 Mar 2018 01:21:36 +0000 (01:21 +0000)]
Merge "Add log for battery tip action." into pi-dev am:
09ed2f2596
am:
291a640420
Change-Id: I44961a0446549c799a9852b97e8d1a36589b742f
Ben Lin [Wed, 21 Mar 2018 01:18:44 +0000 (01:18 +0000)]
Merge "Add Default backup page to list of allowed fragments." into pi-dev
am:
048b71a67c
Change-Id: Ib89ba0f96f650f36cc5286ce48e0bd0df1d79ad5
Maggie Wang [Wed, 21 Mar 2018 01:11:13 +0000 (01:11 +0000)]
Merge "Add an Advanced button to location settings" into pi-dev am:
ff912223b7
am:
b5f4aa911a
Change-Id: Ifc4523cb11346ae14f58940ca003946ed0efa055
Tony Mak [Wed, 21 Mar 2018 00:53:18 +0000 (00:53 +0000)]
Merge "Fix user id is not used correctly when fetching app info" into pi-dev am:
ea43e8285e
am:
e33a04e278
Change-Id: I5ff962974f3131724b5d486747b532d037fefc67
TreeHugger Robot [Wed, 21 Mar 2018 00:44:09 +0000 (00:44 +0000)]
Merge "Remove the overflow menu from the usage Appbar." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 00:39:20 +0000 (00:39 +0000)]
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
Bill Yi [Wed, 21 Mar 2018 00:35:05 +0000 (00:35 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
5b57d1d1cb59d0107ca23c22771777aa9aa00def.
Reason for revert: deleted AS and OR locales
BUG:
76032849
Change-Id: I199238e3111c6917cf2db8e088070a90618841fb
TreeHugger Robot [Wed, 21 Mar 2018 00:28:52 +0000 (00:28 +0000)]
Merge "Remove hardcoded wrong summary" into pi-dev
Phil Weaver [Wed, 21 Mar 2018 00:06:20 +0000 (00:06 +0000)]
Merge "Indicate when accessibility services have stopped" into pi-dev am:
656aad9c93
am:
9eb8ba1b6f
Change-Id: Ia3ac5272b73c404fb2ae36f34654d12a7fd8006a
Salvador Martinez [Wed, 21 Mar 2018 00:05:45 +0000 (00:05 +0000)]
Merge "Update metered string" into pi-dev am:
f9dade022c
am:
b07afe0538
Change-Id: I23f628dd65088a01a980f2ba278945e1bf92e903
Lei Yu [Tue, 20 Mar 2018 23:37:52 +0000 (23:37 +0000)]
Merge "Add log for battery tip action." into pi-dev
am:
09ed2f2596
Change-Id: I4ba9fd91330415ed0f77bb3e4dcd19f47ce2090f
TreeHugger Robot [Tue, 20 Mar 2018 23:31:03 +0000 (23:31 +0000)]
Merge "Index SliceType and Official Platform flag" into pi-dev
Maggie Wang [Tue, 20 Mar 2018 23:28:01 +0000 (23:28 +0000)]
Merge "Add an Advanced button to location settings" into pi-dev
am:
ff912223b7
Change-Id: Iaa51d5f9c3e2e4785183f667b47391a652089d60
Hansong Zhang [Tue, 20 Mar 2018 23:23:18 +0000 (23:23 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev am:
012e04fa02
am:
fbd3076a84
Change-Id: I523108fe5442cad7d9daac1331b58ebfa650600e
Antoan Angelov [Tue, 20 Mar 2018 23:22:40 +0000 (23:22 +0000)]
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
Qingxi Li [Tue, 20 Mar 2018 23:22:13 +0000 (23:22 +0000)]
Merge "UI Tweak for eSIM related" into pi-dev am:
2a6b9ff315
am:
c3d81ef8ab
Change-Id: Id80cd9d315dd63fb7bcd4bdd44798675de1d9595
TreeHugger Robot [Tue, 20 Mar 2018 23:21:17 +0000 (23:21 +0000)]
Merge "Remove battery saver toggle from the Battery screen" into pi-dev
Tony Mak [Tue, 20 Mar 2018 22:56:51 +0000 (22:56 +0000)]
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
am:
ea43e8285e
Change-Id: I11bd697b6243bfe85617d9edadf680d7c35e1427
Ben Lin [Tue, 20 Mar 2018 22:22:18 +0000 (22:22 +0000)]
Merge "Add Default backup page to list of allowed fragments." into pi-dev
Pavel Grafov [Tue, 20 Mar 2018 22:10:33 +0000 (22:10 +0000)]
Merge "Remove "don't show" option from work notifications settings" into pi-dev am:
be3e5caa7f
am:
dfd74e5b1a
Change-Id: I9ad8d5fd5a0a03d1cc0031c95de142e7a9b6b3e6
Chad Brubaker [Tue, 20 Mar 2018 22:00:34 +0000 (22:00 +0000)]
Merge "Fix lockdown string" into pi-dev am:
91b6d17b8d
am:
f74a874dda
Change-Id: I488171ccd5481fde96a904c90f0b77440769883c
Fan Zhang [Tue, 20 Mar 2018 22:00:28 +0000 (15:00 -0700)]
Remove hardcoded wrong summary
Change-Id: Ie96ec9387d77eccad404e3cc81bd0b48299f1c96
Fixes:
75260788
Test: reindexed search and manually search
Phil Weaver [Tue, 20 Mar 2018 21:52:56 +0000 (21:52 +0000)]
Merge "Indicate when accessibility services have stopped" into pi-dev
am:
656aad9c93
Change-Id: I850746d339b79b5fa8353ded4a6fea05a7f5f32c
Salvador Martinez [Tue, 20 Mar 2018 21:51:43 +0000 (21:51 +0000)]
Merge "Update metered string" into pi-dev
am:
f9dade022c
Change-Id: I135eb619e7aa94e1f767cb8f5662286a86c91760
Jan Nordqvist [Tue, 20 Mar 2018 21:32:28 +0000 (14:32 -0700)]
Remove the overflow menu from the usage Appbar.
In Data Usage screen, Above the data bar, Remove the overflow
menu (3 dots on top right of the screen) from the Appbar.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4e8a5e54b1e5c573496ff2a76a5a80da38650f2b
Hansong Zhang [Tue, 20 Mar 2018 21:35:05 +0000 (21:35 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
am:
012e04fa02
Change-Id: Ia4c21f5d21f40b9a17e0b7ae6eb65ab6a8ad08ff
Antoan Angelov [Tue, 20 Mar 2018 21:34:22 +0000 (21:34 +0000)]
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
am:
1bc98edc15
Change-Id: I9adcbcba0c8c72d7f459e7e7d3639686df2b944d
Qingxi Li [Tue, 20 Mar 2018 21:33:53 +0000 (21:33 +0000)]
Merge "UI Tweak for eSIM related" into pi-dev
am:
2a6b9ff315
Change-Id: I286216110518f2143bbddf943b24e560f1e8a192
Makoto Onuki [Fri, 16 Mar 2018 23:47:27 +0000 (16:47 -0700)]
Remove battery saver toggle from the Battery screen
- Also fix bug where the summary doesn't show up until the battery saver state
changes.
Bug:
74120126
Fix:
74400918
Test: manual
Test: b ROBOTEST_FILTER=BatterySaverControllerTest RunSettingsRoboTests
Change-Id: I03ceb8ee2a8d8c33da7ad220148ecc9553911661
TreeHugger Robot [Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)]
Merge "Add log for battery tip action." into pi-dev
Jan Nordqvist [Fri, 16 Mar 2018 22:40:52 +0000 (15:40 -0700)]
Fixed "Primary data" text style and rearranged UI vertically.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5848f8b499aaac911c61860aa1471c9d391614bb
Maggie Wang [Tue, 20 Mar 2018 20:44:23 +0000 (20:44 +0000)]
Merge "Add an Advanced button to location settings" into pi-dev
Andrew Sapperstein [Tue, 20 Mar 2018 20:28:44 +0000 (20:28 +0000)]
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev am:
a3970d4e52
am:
e95d9f34f7
Change-Id: Ie0059b9872248cfbef864e2baa137133989d1f36
Pavel Grafov [Tue, 20 Mar 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Remove "don't show" option from work notifications settings" into pi-dev
am:
be3e5caa7f
Change-Id: I2e7bc6a3494d58569944d5d7ee36fe91ca1c4863
TreeHugger Robot [Tue, 20 Mar 2018 20:24:17 +0000 (20:24 +0000)]
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:16:09 +0000 (20:16 +0000)]
Merge "Indicate when accessibility services have stopped" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:05:07 +0000 (20:05 +0000)]
Merge "Update metered string" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 19:56:51 +0000 (19:56 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
Antoan Angelov [Tue, 20 Mar 2018 19:33:17 +0000 (19:33 +0000)]
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
Chad Brubaker [Tue, 20 Mar 2018 19:30:27 +0000 (19:30 +0000)]
Merge "Fix lockdown string" into pi-dev
am:
91b6d17b8d
Change-Id: I70c2f9cb56da14cd56e0b799b3b815bd54642bad
TreeHugger Robot [Tue, 20 Mar 2018 19:24:59 +0000 (19:24 +0000)]
Merge "UI Tweak for eSIM related" into pi-dev
Andrew Sapperstein [Tue, 20 Mar 2018 19:10:46 +0000 (19:10 +0000)]
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
am:
a3970d4e52
Change-Id: I6d41d2c9cf285a587c4e5b264251da3da80e7071
TreeHugger Robot [Tue, 20 Mar 2018 18:41:13 +0000 (18:41 +0000)]
Merge "Remove "don't show" option from work notifications settings" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:19:09 +0000 (18:19 +0000)]
Merge "Fix lockdown string" into pi-dev
Maggie [Thu, 15 Mar 2018 19:10:18 +0000 (12:10 -0700)]
Add an Advanced button to location settings
Add an Advanced button under "recent location requests" and "app level
permissions" in location settings.
Location footer should still be visible under Advanced button.
Bug:
70350519
Test: Manual
Change-Id: I5db32e911ed6527048c625f691f5476eb77751b3
Salvador Martinez [Tue, 20 Mar 2018 17:27:21 +0000 (10:27 -0700)]
Update metered string
This CL updates the metered network string to say
'detect automatically' instead of 'network preference'
Bug:
68030417
Test: rototest, visual inspection
Change-Id: I347e3b89b014d7ec0d5d0e6601f2813a3a96f5ab
Hansong Zhang [Tue, 20 Mar 2018 01:21:40 +0000 (18:21 -0700)]
Move the setActiveDevice logic from Settings to SettingsLib (2/2)
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.
Bug:
75984255
Test: robolectric test
Change-Id: I5742de1463d156ff29708ea2aecfc3fd00795e9e
TreeHugger Robot [Tue, 20 Mar 2018 17:11:51 +0000 (17:11 +0000)]
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
arangelov [Tue, 20 Mar 2018 14:53:55 +0000 (14:53 +0000)]
Show "Doesn't support work profiles" text in Settings for launchers not
supporting work profiles.
Screenshot: https://screenshot.googleplex.com/iz3xoeSvbOA.png
Test: Manually go to Settings -> Apps & notifications -> Default apps -> Home app.
Test: make ROBOTEST_FILTER=RadioButtonPreferenceTest -j40 RunSettingsRoboTests
Bug:
69297461
Change-Id: I55c721d7ad979c882bb879a974758cf08eaf0c86
Pavel Grafov [Mon, 19 Mar 2018 16:42:11 +0000 (16:42 +0000)]
Move work profile notification settings to the bottom.
Otherwise dynamically added stuff like "Now Playing" is added after it
and looks like it belongs to work profile settings.
Bug:
74785018
Test: manual
Change-Id: Ifc4592613e66a4e3946dedc56732eed855cc6568
Pavel Grafov [Mon, 11 Sep 2017 14:46:46 +0000 (15:46 +0100)]
Remove "don't show" option from work notifications settings
Option to not show notifications is still available for
device-wide locks screen notification settings.
Also s/On lock screen/When work profile is locked/ for work
notifications since it applies not only to lock screen but to
notification shade as well.
Bug:
64829587
Test: make RunSettingsRoboTests
Change-Id: Ie3ec461f4c8887a5a49cd92b5350ea683f701027
HJ ChangLiao [Tue, 20 Mar 2018 14:30:35 +0000 (14:30 +0000)]
Merge "Remove touch effect of Ratio on listitem" into pi-dev am:
a976a0eaad
am:
632d6e06ca
Change-Id: I2555f708d14dd41d9ba665504f11ac1590f7900d
HJ ChangLiao [Tue, 20 Mar 2018 14:20:04 +0000 (14:20 +0000)]
Merge "Remove touch effect of Ratio on listitem" into pi-dev
am:
a976a0eaad
Change-Id: Id8226bd927f8553335e88cce4bd3fe4a2d81833b
TreeHugger Robot [Tue, 20 Mar 2018 14:07:26 +0000 (14:07 +0000)]
Merge "Remove touch effect of Ratio on listitem" into pi-dev
Yvonne Yang [Tue, 20 Mar 2018 11:46:37 +0000 (11:46 +0000)]
Make the preference not selectable am:
7ac7d7b660
am:
2576b0467b
Change-Id: I89c6e218760b4613529abad1030c5d8c89e04f19
Yvonne Yang [Tue, 20 Mar 2018 11:37:31 +0000 (11:37 +0000)]
Make the preference not selectable
am:
7ac7d7b660
Change-Id: I2a3f289bbf5881d99674b9b8af5eb61dad04b508
Ben Lin [Tue, 20 Mar 2018 10:25:08 +0000 (03:25 -0700)]
Add Default backup page to list of allowed fragments.
Bug:
75990141
Test: Attempting to invoke ToggleBackupSettingsFragment via XML maifest
changes works.
Change-Id: Idb00fafa998908c8d1c679054cf93c279f60913d
Yvonne Yang [Fri, 16 Mar 2018 08:48:42 +0000 (16:48 +0800)]
Make the preference not selectable
"Battery usage data isn't available" should not respond to taps
Bug:
69312966
Test: Manual test
Change-Id: Id450c5a6089a4fb78a5c48a0f460992dc89f49ec
Antony Sargent [Tue, 20 Mar 2018 08:35:40 +0000 (08:35 +0000)]
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev am:
cbf9300cd2
am:
0c028eaf69
Change-Id: I8caa982aedffafa227324c20fd5c724335e953a9
ryanywlin [Tue, 20 Mar 2018 08:34:53 +0000 (08:34 +0000)]
Merge "Add "take call on" string for audio output switcher." into pi-dev am:
cd908497d6
am:
ef680f82db
Change-Id: I3207ae88fffab15fbda866bc3e6195589b6d9302
Andreas Terzis [Tue, 20 Mar 2018 08:34:15 +0000 (08:34 +0000)]
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev am:
91ea3c5e56
am:
b32915a9a7
Change-Id: I4ba38734eed324bcb25329d5303ff83032a3ab44
Lei Yu [Tue, 20 Mar 2018 08:33:21 +0000 (08:33 +0000)]
Merge "Add summary for battery manager preference" into pi-dev am:
06d5188a71
am:
fca54d8788
Change-Id: I1bcdf59eefafeca6b63689a8bb68add13f11d962
Lei Yu [Tue, 20 Mar 2018 08:32:40 +0000 (08:32 +0000)]
Merge "Update string for battery seekbar" into pi-dev am:
8916df573d
am:
b5d38cc5f9
Change-Id: I4d631531c96e1afca80edca0779a02a5aa3e20fe
Sunny Goyal [Tue, 20 Mar 2018 08:31:14 +0000 (08:31 +0000)]
Merge "Fixing settings crash when no default home app is set" into pi-dev am:
ee2ac81999
am:
472037fdd3
Change-Id: I529c019f5109297f5ec3064128367d3c66ac931e
hughchen [Tue, 20 Mar 2018 08:28:14 +0000 (08:28 +0000)]
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev am:
138bdf6030
am:
5cf0b2843e
Change-Id: I7529e6fdc451816ab29ede90f433086081a61b24
timhypeng [Tue, 20 Mar 2018 08:08:54 +0000 (08:08 +0000)]
Merge "Add new string for audio switch" into pi-dev am:
73f1a3180a
am:
4ae326b54d
Change-Id: I921b3798ff3fda4b08e31b690861d7079c4536f2
Maurice Lam [Tue, 20 Mar 2018 08:07:54 +0000 (08:07 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev am:
b98eea4c67
am:
f7c9fbea5e
Change-Id: Ic0991d908971f8dc62f0f21c8d5e509c95de3ff0
Fan Zhang [Tue, 20 Mar 2018 08:06:26 +0000 (08:06 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev am:
39b54ea1f8
am:
e147c48470
Change-Id: I0c7473f61ac3a783f8a1559fc88396e73c3f35e9
OSDN Git Service
