Dmitry Dementyev
dd48f602bb
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486 am: d5f3ae5cac
...
am: 0fb3d55e3a
2017-03-09 18:32:28 +00:00
Dmitry Dementyev
7a3593cbc6
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071
...
am: 5330df501f
2017-03-09 18:32:13 +00:00
Dmitry Dementyev
0fb3d55e3a
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486
...
am: d5f3ae5cac
2017-03-09 18:29:27 +00:00
Dmitry Dementyev
5330df501f
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20
...
am: c28fb3e071
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
d5f3ae5cac
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151
...
am: efb9f74486
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
...
am: 3b5b2d6d20
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
efb9f74486
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863
...
am: 2569925151
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
...
am: 8c5c5b5cec
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
2569925151
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours
...
am: f1fb452863
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
am: 0f04a5a93f
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43
...
am: 3964c51bf2
2017-03-09 18:16:23 +00:00
Dmitry Dementyev
0f04a5a93f
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
Dmitry Dementyev
3964c51bf2
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
...
am: def3eddb43
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
...
am: b7e2545217
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
...
am: 3a5e567ab9
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
...
am: 5c4276a258
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
am: e24780ed4c
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Jaewoong Jung
42786ef2f2
Merge "Changes event handling phases for DeviceListPreferenceFragment." am: 084c20409b
...
am: 015fe72cd3
2017-03-07 02:29:45 +00:00
Jaewoong Jung
015fe72cd3
Merge "Changes event handling phases for DeviceListPreferenceFragment."
...
am: 084c20409b
2017-03-07 02:27:15 +00:00
Treehugger Robot
084c20409b
Merge "Changes event handling phases for DeviceListPreferenceFragment."
2017-03-06 23:02:13 +00:00
Jaewoong Jung
7ca9a39960
Changes event handling phases for DeviceListPreferenceFragment.
...
Bug: 31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit e8d5c8fda1
2017-03-06 13:02:35 -08:00
Lorenzo Colitti
db77518a65
Merge "Display the correct default for mobile data always on." am: 737d42a0db
...
am: 58e9855b53
2017-03-06 04:08:55 +00:00
Lorenzo Colitti
58e9855b53
Merge "Display the correct default for mobile data always on."
...
am: 737d42a0db
2017-03-06 04:04:55 +00:00
Treehugger Robot
737d42a0db
Merge "Display the correct default for mobile data always on."
2017-03-06 03:57:50 +00:00
minoru.x.sakuma
36b2de22cf
Merge "Unify the design of add icon in setting" am: bc9731a575
...
am: 398eca1067
2017-03-06 01:25:46 +00:00
minoru.x.sakuma
398eca1067
Merge "Unify the design of add icon in setting"
...
am: bc9731a575
2017-03-06 01:22:16 +00:00
Treehugger Robot
bc9731a575
Merge "Unify the design of add icon in setting"
2017-03-06 01:17:56 +00:00
Lorenzo Colitti
15fb2d1096
Display the correct default for mobile data always on.
...
Mobile data always on was enabled by changing the default in
ConnectivityService to 1. However, the default value in the
developer options setting was left at 0. This means that by
default (i.e., when the setting is empty), mobile data always on
is enabled but appears in developer options as disabled.
Fix this by changing the default in developer options. This is
simpler than the other options (adding database upgrade code to
settings, making the default be controlled by config.xml and
ensuring that when a config changed broadcast is received the
value is re-rease, hardcoding a default value as an @hide
constant in Settings, etc.)
Bug: 23113288
Test: setting is off after "adb shell settings delete global mobile_data_always_on"
Change-Id: I27e2c0af7a03e510e640dbcfa281449d00385154
2017-03-03 18:56:23 +09:00
minoru.x.sakuma
f014ae5bc5
Unify the design of add icon in setting
...
Add icon "+" displayed in APN setting differs from ones in other
settings like VPN settings, SIP accounts etc. Change the icon to
align with others.
Bug: 35936472
Test: Manually check icon display with fix
Change-Id: I99a57fbeb55bb04f911d28e85752ec04edab6f0e
2017-03-03 05:15:02 +00:00
Peter Qiu
d49c2ff80f
Merge "wifi: use Passpoint API when forgetting a Passpoint network" am: ff960ed859
...
am: c5848718ee
2017-03-02 16:59:23 +00:00
Peter Qiu
c5848718ee
Merge "wifi: use Passpoint API when forgetting a Passpoint network"
...
am: ff960ed859
2017-03-02 16:57:25 +00:00
Treehugger Robot
ff960ed859
Merge "wifi: use Passpoint API when forgetting a Passpoint network"
2017-03-02 16:52:42 +00:00
Li Bai
b09610a3dc
Merge "Change default long-press time to 400ms" am: b96cbedfb2
...
am: 957b15c9ae
2017-03-01 19:31:06 +00:00
long.x.qiao
e0e00077bc
Merge "Show search results when query string contains trailing space" am: 8eb0c24e5a
...
am: 19000b747c
2017-03-01 19:28:43 +00:00
Li Bai
957b15c9ae
Merge "Change default long-press time to 400ms"
...
am: b96cbedfb2
2017-03-01 19:28:38 +00:00
Treehugger Robot
b96cbedfb2
Merge "Change default long-press time to 400ms"
2017-03-01 19:26:16 +00:00
long.x.qiao
19000b747c
Merge "Show search results when query string contains trailing space"
...
am: 8eb0c24e5a
2017-03-01 19:25:42 +00:00
Treehugger Robot
8eb0c24e5a
Merge "Show search results when query string contains trailing space"
2017-03-01 19:20:26 +00:00
Peter Qiu
4ec020a424
wifi: use Passpoint API when forgetting a Passpoint network
...
Use WifiManager#removePasspointConfiguration when forgetting a
Passpoint network to remove the configuration.
This maintains the legacy behavior, where forgetting a Passpoint
network/AP will remove its provider's profile.
Bug: 34207710
Test: manual test
Change-Id: I8b7f6d9fb20fa9f0f0d90566f76c2a39308ce420
2017-03-01 10:13:07 -08:00
long.x.qiao
9973b01489
Show search results when query string contains trailing space
...
The query expression used to search for a term prefix is the prefix
itself with a '*' character appended to it. However, if query string
contains trailing space, the query expresssion (e.g. "screen *") doesn't
work. So to fix this issue, the unnecessary trailing space should be
removed.
Bug: 35231587
Test: manual - go to search in Settings and enter "screen "
Change-Id: Ifa5d96f5d38ad5454272f140da440b8ff55d5614
2017-03-01 21:00:57 +09:00
Meng Wang
556e3bb3e8
Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316ec
...
am: e21cbcb6b4
2017-02-27 18:32:30 +00:00
Meng Wang
e21cbcb6b4
Merge "WiFiCallingSettings: don't start carrier app in onResume"
...
am: 05c88316ec
2017-02-27 18:29:48 +00:00
Treehugger Robot
05c88316ec
Merge "WiFiCallingSettings: don't start carrier app in onResume"
2017-02-27 18:25:05 +00:00
Meng Wang
d3b0c37ef2
WiFiCallingSettings: don't start carrier app in onResume
...
onResume initialize UI before registering switch change listener.
So that listener is not invoked in UI initialization, but only real
switch change by user.
Bug: 33680334
Test: make
Test: manual - carrier app is not invoked in onResume
Change-Id: I7ca1eb1eab214b50c8de72946590c1ecb676d4df
2017-02-25 10:23:23 -08:00
Marie Janssen
14795a7855
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am: 17ad73ed9b
...
am: 019c8f38fe
2017-02-25 13:47:59 +00:00
Marie Janssen
019c8f38fe
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
...
am: 17ad73ed9b
2017-02-25 13:44:29 +00:00
Treehugger Robot
17ad73ed9b
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
2017-02-25 13:39:28 +00:00
Marie Janssen
41cdfd8887
Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
...
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.
Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix: 35246073
2017-02-25 13:39:16 +00:00
Chen Xu
9f5e1f92b8
Merge "move ACTION_CARRIER_SETUP intent to public api" am: d989558616
...
am: fbf747bb76
2017-02-25 01:17:45 +00:00
