Lei Yu
3b807021bb
Merge "Update method isSmartBatteryEnabled()" into pi-dev am: 3feb2f87ff
...
am: c409db681d
2018-05-16 20:13:29 -07:00
Nitin Shivpure
82241d0d48
[automerger skipped] Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" am: 2d523f4e99 am: 606f1d02eb -s ours
...
am: a7914f54df
2018-05-16 20:03:24 -07:00
Lei Yu
c409db681d
Merge "Update method isSmartBatteryEnabled()" into pi-dev
...
am: 3feb2f87ff
2018-05-16 19:56:01 -07:00
Nitin Shivpure
a7914f54df
[automerger skipped] Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" am: 2d523f4e99
...
am: 606f1d02eb
2018-05-16 19:53:26 -07:00
Nitin Shivpure
606f1d02eb
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
...
am: 2d523f4e99
2018-05-16 19:44:41 -07:00
TreeHugger Robot
3feb2f87ff
Merge "Update method isSmartBatteryEnabled()" into pi-dev
2018-05-17 02:43:22 +00:00
Treehugger Robot
2d523f4e99
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
2018-05-17 01:28:02 +00:00
hjchangliao
5bb780195d
[automerger skipped] Merge "Convert Magnify controller to TogglePrefController" into pi-dev am: cd28a977ca
...
am: 55e51376b1
2018-05-16 18:19:20 -07:00
hjchangliao
55e51376b1
Merge "Convert Magnify controller to TogglePrefController" into pi-dev
...
am: cd28a977ca
2018-05-16 18:10:56 -07:00
TreeHugger Robot
cd28a977ca
Merge "Convert Magnify controller to TogglePrefController" into pi-dev
2018-05-17 00:43:04 +00:00
Matthew Fritze
d9738d81c1
Merge "Clean-up settings slices" into pi-dev am: d0888e9e5b
...
am: 4381e162f2
2018-05-16 17:41:27 -07:00
Daniel Nishi
e84eced513
Merge "Darken the secondary text on storage items." into pi-dev am: 0226c4d39d
...
am: a224cb4aaa
2018-05-16 17:39:12 -07:00
Matthew Fritze
4381e162f2
Merge "Clean-up settings slices" into pi-dev
...
am: d0888e9e5b
2018-05-16 17:33:28 -07:00
TreeHugger Robot
d0888e9e5b
Merge "Clean-up settings slices" into pi-dev
2018-05-17 00:26:32 +00:00
Daniel Nishi
a224cb4aaa
Merge "Darken the secondary text on storage items." into pi-dev
...
am: 0226c4d39d
2018-05-16 17:25:09 -07:00
TreeHugger Robot
0226c4d39d
Merge "Darken the secondary text on storage items." into pi-dev
2018-05-17 00:13:05 +00:00
Andreas Terzis
b0ba614c4c
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev am: 6eb1d9ed90
...
am: 4b31e19522
2018-05-16 16:58:55 -07:00
Mehdi Alizadeh
6ed77203e8
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9
...
am: 84586334b2
2018-05-16 16:53:44 -07:00
Andreas Terzis
4b31e19522
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev
...
am: 6eb1d9ed90
2018-05-16 16:49:50 -07:00
Andreas Terzis
6eb1d9ed90
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev
2018-05-16 23:44:35 +00:00
Nitin Shivpure
ec5a3f9c01
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev am: d924894652
...
am: 75787c8a77
2018-05-16 16:43:00 -07:00
Mehdi Alizadeh
84586334b2
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev
...
am: 9a93a1dbe9
2018-05-16 16:42:52 -07:00
Nitin Shivpure
75787c8a77
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev
...
am: d924894652
2018-05-16 16:41:43 -07:00
Matthew Fritze
11916e00ab
Merge "Set slice summary text to screentitle first" into pi-dev am: e7f321c3c0
...
am: caf745ea13
2018-05-16 16:39:05 -07:00
TreeHugger Robot
9a93a1dbe9
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev
2018-05-16 23:38:31 +00:00
TreeHugger Robot
d924894652
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev
2018-05-16 23:28:28 +00:00
Matthew Fritze
caf745ea13
Merge "Set slice summary text to screentitle first" into pi-dev
...
am: e7f321c3c0
2018-05-16 16:08:00 -07:00
TreeHugger Robot
e7f321c3c0
Merge "Set slice summary text to screentitle first" into pi-dev
2018-05-16 22:51:55 +00:00
Daniel Nishi
e5a006f61b
Darken the secondary text on storage items.
...
This darkens the X.XX GB text on the storage items to improve the
contrast between the text and the background color.
Bug: 79754437
Test: Manual
Change-Id: Icc44a97d810cd1aea22438f38e5e97ddb7b8e43d
2018-05-16 15:34:34 -07:00
Nitin Shivpure
5ba33d1fd3
Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak
...
Usecase:
1.) Make sure BT is turned off.
2.) Go to Settings -> Network & Internet
3.) Press back from Network & Internet.
4.) Repeat above step 2000 times
Expected Result:
No ANR/Crashed should be seen.
Observed Result:
ServiceConnection leak is happening & android setting app get crashed.
Root cause: TetherPreferenceController tries to get
pan Proxy object, when BT is oFF, which is leaking one
service connection each time
Fix: getProfileProxy for Pan must only be called, when BT is
turned on.
Test: lifeCycle_onCreate_shouldNotInitBluetoothPanWhenBluetoothOff
Bug: 79561076
Change-Id: I85208f48ce4dded94020cb156fcdb98b2cc873f9
Merged-In: I85208f48ce4dded94020cb156fcdb98b2cc873f9
2018-05-16 15:25:36 -07:00
Nitin Shivpure
1b0afb9d1c
Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak
...
Usecase:
1.) Make sure BT is turned off.
2.) Go to Settings -> Network & Internet
3.) Press back from Network & Internet.
4.) Repeat above step 2000 times
Expected Result:
No ANR/Crashed should be seen.
Observed Result:
ServiceConnection leak is happening & android setting app get crashed.
Root cause: TetherPreferenceController tries to get
pan Proxy object, when BT is oFF, which is leaking one
service connection each time
Fix: getProfileProxy for Pan must only be called, when BT is
turned on.
Test: lifeCycle_onCreate_shouldNotInitBluetoothPanWhenBluetoothOff
Bug: 79561076
Change-Id: I85208f48ce4dded94020cb156fcdb98b2cc873f9
(cherry picked from commit 31bcf6225cdabee4f810d4fe55ea32d0d43a9c5c)
(cherry picked from commit 31c799305b480e56bd083a48c6acca11572ebe16)
2018-05-16 15:22:56 -07:00
Fan Zhang
21d1652158
[automerger skipped] Merge "Move app setting link from Entity header to pref controller" into pi-dev am: e3319d0449
...
am: afb17b6ed1
2018-05-16 14:21:57 -07:00
Fan Zhang
afb17b6ed1
Merge "Move app setting link from Entity header to pref controller" into pi-dev
...
am: e3319d0449
2018-05-16 14:08:25 -07:00
TreeHugger Robot
e3319d0449
Merge "Move app setting link from Entity header to pref controller" into pi-dev
2018-05-16 20:51:17 +00:00
Fan Zhang
cac18e12ac
Move app setting link from Entity header to pref controller
...
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Merged-In: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 19:56:33 +00:00
Mehdi Alizadeh
16db9e14d7
Merge "Adds two overlay settings fields for Swipe Up gesture"
2018-05-16 19:52:02 +00:00
Fan Zhang
8e925a4282
Merge "Move app setting link from Entity header to pref controller"
2018-05-16 19:48:32 +00:00
Andreas Terzis
251bcbec13
Increase the char limit of carrier_and_update_now_text to 34.
...
The translation of the carrier_and_update_now_text field
in some European languages requires 34 characters. To
accomodate these requirements increase the character
limit from 30 to 34.
Bug: 76443102
Test: manual
Change-Id: I61c95fc6c30bd98d6b418047ae7cc1f2423a12e0
2018-05-16 12:35:25 -07:00
joeshih
36b7896f5d
[automerger skipped] Merge "Support Vibrate for calls in Settings Slices" into pi-dev am: a0f9241400
...
am: 421b0cf526
2018-05-16 12:26:27 -07:00
TreeHugger Robot
77d9076158
Merge "Merge Ambient display into Lockscreen settings."
2018-05-16 19:15:40 +00:00
joeshih
421b0cf526
Merge "Support Vibrate for calls in Settings Slices" into pi-dev
...
am: a0f9241400
2018-05-16 11:58:11 -07:00
Mehdi Alizadeh
5ab8077f44
Adds two overlay settings fields for Swipe Up gesture
...
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.
Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-16 11:54:27 -07:00
TreeHugger Robot
a0f9241400
Merge "Support Vibrate for calls in Settings Slices" into pi-dev
2018-05-16 18:48:14 +00:00
TreeHugger Robot
35d3b2549f
Merge "Convert Magnify controller to TogglePrefController"
2018-05-16 18:39:29 +00:00
TreeHugger Robot
9f31b4803b
Merge "Update zen onboarding"
2018-05-16 18:38:41 +00:00
Fan Zhang
30d4d015b5
Merge Ambient display into Lockscreen settings.
...
And remove the entry point from security page. Now we only have 1 entry
point from Display page.
Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
2018-05-16 11:24:32 -07:00
hughchen
8f553c0459
Merge "Change string from "Add device" to "Pair new device"" into pi-dev am: 46338558e1
...
am: 14ce329377
2018-05-16 10:56:32 -07:00
Fan Zhang
e2346643c7
Move app setting link from Entity header to pref controller
...
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 10:51:31 -07:00
hughchen
14ce329377
Merge "Change string from "Add device" to "Pair new device"" into pi-dev
...
am: 46338558e1
2018-05-16 10:47:40 -07:00
TreeHugger Robot
46338558e1
Merge "Change string from "Add device" to "Pair new device"" into pi-dev
2018-05-16 17:32:38 +00:00
