Maurice Lam
27d74fa288
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
2014-09-16 18:35:39 +00:00
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
fbb0218a11
am 1741abb9
: (-s ours) am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1741abb95c2a30cd10ba829aca345b3d919f3ef6':
Import translations. DO NOT MERGE
2014-09-16 18:03:21 +00:00
Baligh Uddin
1741abb95c
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:42 +00:00
Baligh Uddin
09a11d5bf4
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:16:37 +00:00
PauloftheWest
d1cd913a6e
am 9007cf63
: am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit '9007cf6369eee6179082de8c769da6cad4906831':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 08:52:57 +00:00
Edward Jee
000dd0a6b2
am a99ef887
: am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit 'a99ef8871e204a04bc2b6436eede2078f8001b98':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 08:52:57 +00:00
Edward Jee
32c56ed434
am 50b6eec9
: am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit '50b6eec908fa76dfe426016d621cda3b013846b1':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 08:52:55 +00:00
PauloftheWest
8dee66d124
am 720af580
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '720af58039c31bbf9f239600a898202b971987f5':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 08:52:54 +00:00
Dianne Hackborn
2acec6768f
am bf4ecab3
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit 'bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 08:52:53 +00:00
Dianne Hackborn
ff966f2a82
am 829b9975
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit '829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 08:52:52 +00:00
Maurice Lam
ea8db10ac8
am 0d09c6c1
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
[WifiSetup] Disable app starting window
2014-09-16 08:52:51 +00:00
PauloftheWest
9007cf6369
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:32:12 +00:00
Edward Jee
a99ef8871e
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:32:11 +00:00
Edward Jee
50b6eec908
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:32:10 +00:00
PauloftheWest
720af58039
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:32:09 +00:00
Dianne Hackborn
bf4ecab3eb
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:32:08 +00:00
Dianne Hackborn
829b9975b6
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:32:07 +00:00
Maurice Lam
0d09c6c190
am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
2014-09-16 08:32:06 +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
f1fc721929
am 24233660
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit '2423366021337a4fff71defdd1c6484df10c0e3b':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-15 19:31:20 +00:00
PauloftheWest
2423366021
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:05:48 +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
1097e836e4
am 2ce54402
: am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:15:04 +00:00
Prem Kumar
2ce5440203
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
3ea47dd063
am 89147d72
: am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit '89147d726b0f3c4e69f3028c8043f71c14bc6f81':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 20:09:40 +00:00
John Spurlock
89147d726b
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 19:51:01 +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
0950409350
am d03caf70
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit 'd03caf70865f50f74db2613f9d0c68ee50e22190':
Renaming Telecomm to Telecom.
2014-09-13 18:03:11 +00:00
Tyler Gunn
d03caf7086
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 17:47:28 +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
fd2a303616
am dbb4a6b7
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit 'dbb4a6b704e8feaba5f31623c66ee30fef8af680':
Prevent PIN/Passwword disappearing during boot
2014-09-12 23:22:13 +00:00
Paul Lawrence
dbb4a6b704
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:22 +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
31095ca6e5
am f57f94e9
: am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'f57f94e973b9fba78d08301568b109d983d0b425':
Fix crash when showing accounts.
2014-09-12 20:02:39 +00:00