Commit Graph

30298 Commits

Author SHA1 Message Date
Dmitry Dementyev
7a3593cbc6 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071
am: 5330df501f

Change-Id: I32c0ac9a2a38b01417ccf9135b4bfc002af68cc7
2017-03-09 18:32:13 +00:00
Dmitry Dementyev
5330df501f resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20
am: c28fb3e071

Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
c28fb3e071 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
am: 3b5b2d6d20

Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
3b5b2d6d20 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
8c5c5b5cec resolve merge conflicts of 3964c51bf2 to nyc-dev
am: 0f04a5a93f

Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
2017-03-09 18:19:10 +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
Jaewoong Jung
42786ef2f2 Merge "Changes event handling phases for DeviceListPreferenceFragment." am: 084c20409b
am: 015fe72cd3

Change-Id: Ice1275e292262a86caafe64d01676eaccad0f702
2017-03-07 02:29:45 +00:00
Jaewoong Jung
015fe72cd3 Merge "Changes event handling phases for DeviceListPreferenceFragment."
am: 084c20409b

Change-Id: Ic0abdcd7a7de944b3348590cdfa922fcf1dcbed1
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

Change-Id: I7f27267da9773d4ffe8f7c476efb4839b1ba496c
2017-03-06 04:08:55 +00:00
Lorenzo Colitti
58e9855b53 Merge "Display the correct default for mobile data always on."
am: 737d42a0db

Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303
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

Change-Id: I5bf02f104479aba4e1dc199c07077cff5afdffc2
2017-03-06 01:25:46 +00:00
minoru.x.sakuma
398eca1067 Merge "Unify the design of add icon in setting"
am: bc9731a575

Change-Id: Ieae295ad277877e52399032908677c15180159d3
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

Change-Id: I05bf08cbd3231c5c6579c3a1949c24e0cccfd446
2017-03-02 16:59:23 +00:00
Peter Qiu
c5848718ee Merge "wifi: use Passpoint API when forgetting a Passpoint network"
am: ff960ed859

Change-Id: I0e085c5c31656c943d7674770ea9f28d963f2726
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

Change-Id: I7a0b5216e5551223b626b0ab1c7addf4cec2463c
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

Change-Id: I250cc44ea08498ef751c3f9cf370b09b7cd0e39f
2017-03-01 19:28:43 +00:00
Li Bai
957b15c9ae Merge "Change default long-press time to 400ms"
am: b96cbedfb2

Change-Id: I953076ce2fe44fb96f2cfbd60e771694c225fc99
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

Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f
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

Change-Id: If09bb76b63b0e71d3fa9cf6a42c2436e52093d6a
2017-02-27 18:32:30 +00:00
Meng Wang
e21cbcb6b4 Merge "WiFiCallingSettings: don't start carrier app in onResume"
am: 05c88316ec

Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
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

Change-Id: I12084f452872d8fb9778ad6360c8e58196fdcddf
2017-02-25 13:47:59 +00:00
Marie Janssen
019c8f38fe Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am: 17ad73ed9b

Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
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

Change-Id: I4fa43c07a96d070c209e6c71a7c5227958aef2ee
2017-02-25 01:17:45 +00:00
Chen Xu
fbf747bb76 Merge "move ACTION_CARRIER_SETUP intent to public api"
am: d989558616

Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
2017-02-25 01:11:04 +00:00
Chen Xu
d989558616 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
fionaxu
181138d2d1 move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs 33679956

Test: Manual
Bug: 33679956
Merged-in: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
Change-Id: I84ffd5f2c8c3418689ee3d5ff5ddc3f9f7959763
2017-02-24 10:45:12 -08:00
Marie Janssen
dd0c9e6265 Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9
am: 7b9f96983d

Change-Id: I0392be2a4016dd8df5cb5f682a858178a3a2dd37
2017-02-23 21:56:41 +00:00
Marie Janssen
7b9f96983d Merge "Bluetooth: service for pairing notification"
am: 7dfc705ad9

Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
2017-02-23 21:52:24 +00:00
Marie Janssen
7dfc705ad9 Merge "Bluetooth: service for pairing notification" 2017-02-23 21:41:05 +00:00
Bill Yi
8d36f807bc Import translations. DO NOT MERGE
am: 55ba636186  -s ours

Change-Id: I9d64b082f425dbc5bd37b453e51a5e01127400a4
2017-02-22 18:51:16 +00:00
Bill Yi
55ba636186 Import translations. DO NOT MERGE
Change-Id: Ied9c4535fc4e6739099864f17584108b1d938c50
Auto-generated-cl: translation import
2017-02-22 08:50:31 -08:00
Marie Janssen
d06d83c531 Bluetooth: service for pairing notification
Use a foreground service to show the notification, separating dialog
creation from the receiver.

Test: pair request from remote device while the screen is off
Bug: 35234069
Change-Id: Ia3be3e8efdacf465e095af5a498ef5eb0fca83cd
2017-02-21 14:43:40 -08:00
Junda Liu
3e24e46b39 Ignore orientation change to preserve ApnEditor. am: f414d58ddf am: 77f75b3859
am: 8db5e61fac

Change-Id: I0b00e7afb390fb91556f0abc5b2bfdee39af767f
2017-02-17 18:12:27 +00:00
Junda Liu
7372d9d323 Ignore orientation change to preserve ApnEditor. am: f414d58ddf am: 77f75b3859
am: 1bc3adf38a

Change-Id: Id8fa449ad8bc7f3b36c26ad2bfb0c8d79a04376e
2017-02-17 18:12:08 +00:00
Junda Liu
1bc3adf38a Ignore orientation change to preserve ApnEditor. am: f414d58ddf
am: 77f75b3859

Change-Id: Idf45ab75502d89ed26cf082e11f155b7d6201658
2017-02-17 18:07:06 +00:00