Dianne Hackborn
cc9cacb5d4
am 4e2f9ca6
: am 99b1261c
: am 9e4b5269
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '4e2f9ca6dbdc28a3d38ee5f0491a094431a9b509':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-17 05:13:01 +00:00
Dianne Hackborn
be46e2a4bd
am 5df5798e
: am 6d9988e7
: am ebcba9dc
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit '5df5798e619a9a73946c4b0ce61cd366e5a9f90b':
Fix issue #17495264 : Battery history graph is bad
2014-09-17 05:13:00 +00:00
Maurice Lam
b3f7de50ab
am 9bfbf642
: am 24956de0
: am 95b283aa
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '9bfbf6426bff4c7b8b074f0701dbf539b6c34b51':
[WifiSetup] Disable app starting window
2014-09-17 05:12:58 +00:00
Amith Yamasani
f5d14b2aed
Don't allow creating a guest from a secondary user...
...
unless the primary user has allowed Guest and user creation from
lockscreen.
Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
2014-09-16 16:36:40 -07:00
PauloftheWest
effc8f52af
am 9de624d8
: am 7b03a452
: am dc985292
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit '9de624d837513b4650f973d609006b03140f5507':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 21:03:12 +00:00
Prem Kumar
24bfab6f23
am 02f66ba7
: am 07e5ea99
: am 319e7a27
: am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '02f66ba78c67567275fca7fd994a9d3df023befe':
2014-09-16 20:32:54 +00:00
John Spurlock
6770d06345
am c9f6945f
: am be0827dd
: am f97ec546
: am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit 'c9f6945fc80511de36c6e7029b49a0d322b9aaa5':
2014-09-16 20:31:48 +00:00
Tyler Gunn
0c07932111
am 2b3505ed
: am 8bad5a2d
: am 86e452f9
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '2b3505edb2884f3b69cf805486ecfefe83992172':
2014-09-16 20:29:45 +00:00
Maurice Lam
b4f5e0bd61
am 2ffb10d2
: am fd4e0f25
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:44:14 +00:00
Maurice Lam
2ffb10d28b
am fd4e0f25
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:36:47 +00:00
Maurice Lam
670e1e5e5a
am ac115451
: am 7fc505a1
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit 'ac115451eb393723dffb4a4339a533d471645c85':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:09:34 +00:00
Maurice Lam
ac115451eb
am 7fc505a1
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '7fc505a1ca9ba65b95189187bc3bde78258be547':
[WifiSetup] Update connection state for auto-finish
2014-09-16 18:57:34 +00:00
Maurice Lam
fd4e0f2567
am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
2014-09-16 18:47:07 +00:00
Maurice Lam
7fc505a1ca
am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
2014-09-16 18:46:36 +00:00
Maurice Lam
27d74fa288
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
2014-09-16 18:35:39 +00:00
Baligh Uddin
072f390b58
am fbb0218a
: (-s ours) am 1741abb9
: (-s ours) am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
Import translations. DO NOT MERGE
2014-09-16 18:22:37 +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
c6954436fb
am bbaad6b9
: (-s ours) am 453053db
: (-s ours) am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'bbaad6b9a774129cc0b4d5109cea3dbf8ef88d62':
Import translations. DO NOT MERGE
2014-09-16 17:18:18 +00:00
PauloftheWest
2aed3a5ef7
am ebb04444
: am 9e7073ae
: am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit 'ebb04444a14d7ca32f5eddc2644602f3ab25f6f8':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 17:18:17 +00:00
Edward Jee
78189c647e
am a17545fa
: am c64a51cb
: am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit 'a17545faaf3ead1feb165a7f6529a54c4019faf2':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 17:18:16 +00:00
Edward Jee
69010fb13a
am ea9c43ca
: am 299faadb
: am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit 'ea9c43ca6503d6bd57f7258341a41a664c7a7cee':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 17:18:15 +00:00
PauloftheWest
3724edb357
am f4713e0f
: am 99f7d73b
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit 'f4713e0fad08dbcde9b61ad2bf8ec646d8022c14':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 17:18:15 +00:00
Dianne Hackborn
4e2f9ca6db
am 99b1261c
: am 9e4b5269
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '99b1261c1f0ea0e71d41014e6fdddbf3f1912bcb':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 17:18:14 +00:00
Dianne Hackborn
5df5798e61
am 6d9988e7
: am ebcba9dc
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit '6d9988e79ec5b8d1480f50e45fe58e358574115b':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 17:18:13 +00:00
Maurice Lam
9bfbf6426b
am 24956de0
: am 95b283aa
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '24956de0e0405ee3165d289ce74a87e70855b46b':
[WifiSetup] Disable app starting window
2014-09-16 17:18:12 +00: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
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
Paul Lawrence
158a291f63
am 36d8bd3b
: am db51c76a
: am 7f4c4fb5
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit '36d8bd3bf7267f38af9f53be7bce70d93b5f3bfa':
2014-09-16 15:21:16 +00:00
Kenny Guy
9d266fb852
am daa4a466
: am 28d2fa62
: am 1ede808c
: am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'daa4a46633cc1175a8dcb3a60fe968d088dee377':
2014-09-16 15:21:15 +00:00
Alexandra Gherghina
6042208720
am 7a09535c
: am cd321d81
: am 69af2c6a
: am f738895d
: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit '7a09535c734cb9da9dcf66bef8b5265f0f65882a':
2014-09-16 15:21:14 +00:00
PauloftheWest
8d8c566934
am e438c383
: am 6c1d69ba
: am 9f96ac6f
: am 37b1253a
: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit 'e438c38323f9e3132110ab561235b766d5e800c0':
2014-09-16 15:21:13 +00:00
Dianne Hackborn
1d463fb1e1
am f7acc1b3
: am c857cddf
: am 364ca371
: am a5780340
: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
...
* commit 'f7acc1b3115bee7536804ee77579eb213db67525':
2014-09-16 15:21:12 +00:00
Svetoslav
c73b179d59
am 0a91a8d2
: am c33aef20
: am c50841ca
: am 85dcef12
: Fix settings crash in print job screen.
...
* commit '0a91a8d24dd7098d31410f14a36067a7fe963ff4':
2014-09-16 15:21:11 +00:00
Vinit Deshpande
7ae64011ad
am 84912814
: am 7aaccec0
: am c471629c
: am 0a11f605
: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '84912814f50934ddb8e6c968d829a00873037bb2':
2014-09-16 15:21:10 +00:00
Svetoslav
3ade85ec73
am 9af0fce6
: am 536cb798
: am 842e9d04
: am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '9af0fce66a9262c5563a588dbc998f451ca40469':
2014-09-16 15:21:09 +00:00
Carlos Valdivia
afc3276323
am 4806e47d
: am 456fbe88
: am a8627dd8
: am f79797c8
: am ea2fa0d9
: am db591467
: am 737d2d53
: am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '4806e47d55ff4797ba2a93c1f94414219d5358cb':
2014-09-16 15:21:08 +00:00
Baligh Uddin
6849828060
am 2dd62886
: (-s ours) am f053f532
: (-s ours) am a2e918af
: (-s ours) am 9b45212b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2dd62886faea7b923aa1abaf4e5e7b681c400ba7':
2014-09-16 15:21:08 +00:00
Dan Sandler
d446e4750a
am fecd8989
: am 99e467a7
: am e98bee54
: am 1fb51987
: Merge "Show a better list of apps." into lmp-dev
...
* commit 'fecd8989854aaf09fd5f761ac863e116534e9177':
2014-09-16 15:21:07 +00:00
Zoltan Szatmary-Ban
f51abf9a64
am bc8f3d08
: am 118cf516
: am 55cd479d
: am cf911d10
: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
2014-09-16 15:21:06 +00:00
Zoltan Szatmary-Ban
5b792c6b81
am 23496243
: am b2259b3a
: am b46eeeb7
: am f572fdd1
: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit '2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
2014-09-16 15:21:05 +00:00
Fabrice Di Meglio
5b871c7630
am 88ff5747
: am a2bba88b
: am b88d24df
: am f8310c18
: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
...
* commit '88ff5747b67df59fd623b177a06bce86b5031fb8':
2014-09-16 15:21:04 +00:00