Maurice Lam
610fdf3343
[WifiSetup] Update connection state for auto-finish
...
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.
Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
2014-09-16 11:05:28 -07:00
Baligh Uddin
bbaad6b9a7
am 453053db
: (-s ours) am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '453053dbcd97bede894e1354e8153039c06a17bb':
Import translations. DO NOT MERGE
2014-09-16 16:50:33 +00:00
PauloftheWest
ebb04444a1
am 9e7073ae
: am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit '9e7073aeb9c5ba03fe6d4f4a46a07a20eefad887':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 16:47:35 +00:00
Edward Jee
a17545faaf
am c64a51cb
: am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit 'c64a51cb603193079ab0f695242012bf803ef4aa':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 16:47:35 +00:00
Edward Jee
ea9c43ca65
am 299faadb
: am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit '299faadbfc73f62ed0e8be968d62a42daf203e87':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 16:47:34 +00:00
PauloftheWest
f4713e0fad
am 99f7d73b
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '99f7d73b4722b196ba66d9e70741db0ced53b3c9':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 16:47:33 +00:00
Dianne Hackborn
99b1261c1f
am 9e4b5269
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '9e4b526951eaccc4aeb1d85a5d9e52a996a7b1d0':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 16:47:32 +00:00
Dianne Hackborn
6d9988e79e
am ebcba9dc
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ebcba9dca7290cf1e4f1d263408f1af98b89a853':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 16:47:31 +00:00
Maurice Lam
24956de0e0
am 95b283aa
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '95b283aabd26a757bc80abf6beff36346d15b20b':
[WifiSetup] Disable app starting window
2014-09-16 16:47:30 +00:00
Baligh Uddin
453053dbcd
am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE
2014-09-16 15:26:43 +00:00
Baligh Uddin
09a11d5bf4
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:16:37 +00:00
PauloftheWest
9e7073aeb9
am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 08:31:59 +00:00
Edward Jee
c64a51cb60
am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit 'ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 08:31:59 +00:00
Edward Jee
299faadbfc
am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 08:31:58 +00:00
PauloftheWest
99f7d73b47
am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 08:31:57 +00:00
Dianne Hackborn
9e4b526951
am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '94aae9afd18c17848aed68addd19d93c937c7555':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 08:31:56 +00:00
Dianne Hackborn
ebcba9dca7
am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 08:31:55 +00:00
Maurice Lam
95b283aabd
am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
2014-09-16 08:31:54 +00:00
Vinit Deshpande
e2c1d504fc
Fix automatic Wi-fi toggle
...
It is happening because there previous view doesn't disconnect
itself from setting change; and then two views alternatively
enable/disable wifi.
Bug: 17157005
Change-Id: I42916a7bbd735960a26efbae670c9b927ec8574d
2014-09-15 20:18:35 -07:00
PauloftheWest
ec21e62a78
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
2014-09-16 02:13:29 +00:00
Edward Jee
ac8b5b7fd6
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug: 17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
2014-09-16 01:25:47 +00:00
Edward Jee
b0954c1d1e
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
2014-09-16 01:19:07 +00:00
PauloftheWest
8ad6c3fe55
Alignment updates for Wi-Fi Settings dialog.
...
Bug: 17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
2014-09-15 16:49:31 -07:00
Edward Jee
a539716a94
Do not show phonebook access permission dialog if pairing dialog has already been shown.
...
Bug: 16964116, 13886947, 16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
2014-09-15 21:25:13 +00:00
Dianne Hackborn
94aae9afd1
Little more on issue #17495264 : tweak when we ignore initial times.
...
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
2014-09-15 14:00:37 -07:00
Dianne Hackborn
ecffbc91b1
Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
2014-09-15 20:51:46 +00:00
PauloftheWest
7b03a45227
am dc985292
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'dc985292be99c6330ec26a912a5d025f0986158a':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-15 19:29:39 +00:00
PauloftheWest
dc985292be
am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-15 19:04:58 +00:00
Maurice Lam
795511ec9c
[WifiSetup] Disable app starting window
...
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.
Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
2014-09-15 11:40:34 -07:00
Sander Alewijnse
e625a57a28
Update targetSdkVersion check.
...
Bug:16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
2014-09-15 18:55:56 +01:00
PauloftheWest
f4b548c0f5
Removed all references to "Google Wi-Fi Assistant" from Settings.
...
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card. Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.
Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
2014-09-15 09:31:56 -07:00
PauloftheWest
13fbd848d4
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
2014-09-15 14:35:46 +00:00
Baligh Uddin
9ad0d03486
Import translations. DO NOT MERGE
...
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
2014-09-14 23:05:45 -07:00
Dianne Hackborn
2b54a9fa57
Fix issue #17495264 : Battery history graph is bad
...
Deal better with wall clock time changes in the battery history.
Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
2014-09-14 19:17:17 -07:00
Prem Kumar
07e5ea995b
am 319e7a27
: am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '319e7a27c89afc5e1da54e7a3b33943e89e79211':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:15:41 +00:00
Prem Kumar
319e7a27c8
am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
2014-09-14 23:51:21 +00:00
John Spurlock
be0827ddf3
am f97ec546
: am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit 'f97ec5468407fa6ce66ddb9f72022867c50e72cd':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 21:17:53 +00:00
John Spurlock
f97ec54684
am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 21:04:52 +00:00
John Spurlock
2e205e9b4b
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
2014-09-14 19:36:20 +00:00
John Spurlock
41e8351448
Settings: Use new PowerManager call to set low power mode.
...
Bind the master switch to the power manager state instead
of directly to the single setting.
Depends on frameworks/base change:
Ic030504c9cad9868a7137abbe837b170da37852b
Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
2014-09-14 11:23:01 -04:00
Tyler Gunn
8bad5a2d0d
am 86e452f9
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '86e452f9577e37dfae4f7160a28448b66084e5d9':
Renaming Telecomm to Telecom.
2014-09-13 20:28:52 +00:00
Tyler Gunn
86e452f957
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 20:12:59 +00:00
Tyler Gunn
3e71b197f7
Renaming Telecomm to Telecom.
...
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
2014-09-12 20:22:25 -07:00
Paul Lawrence
db51c76a4c
am 7f4c4fb5
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit '7f4c4fb5b6e05eb5affe5f64381e0b5374c869db':
Prevent PIN/Passwword disappearing during boot
2014-09-12 22:25:36 +00:00
Paul Lawrence
7f4c4fb5b6
am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
Prevent PIN/Passwword disappearing during boot
2014-09-12 22:05:33 +00:00
Paul Lawrence
c64c9808b9
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
2014-09-12 21:44:48 +00:00
Kenny Guy
28d2fa6215
am 1ede808c
: am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit '1ede808c61bd0a9c420ca2eb532cbbc31881cad5':
Fix crash when showing accounts.
2014-09-12 20:03:01 +00:00
Kenny Guy
1ede808c61
am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
2014-09-12 19:37:22 +00:00