Mark Salyzyn
9d690250b8
am 66718d5a
: am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
logd: settings: ro.config.low_ram support
2014-09-17 23:32:00 +00:00
Mark Salyzyn
66718d5a6e
am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
2014-09-17 23:25:54 +00:00
Mark Salyzyn
894af268de
logd: settings: ro.config.low_ram support
...
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
2014-09-17 22:26:16 +00:00
PauloftheWest
10773b4d4d
Removed an extraneous messge when pairing.
...
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug: 17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
2014-09-17 14:46:14 -07:00
Amith Yamasani
e1d6666452
am befe3c6f
: am c7ab2db7
: am 80a1ced5
: am 69b67465
: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit 'befe3c6ff75995fd2bfd45155ff3064e1a4b3fbe':
Don't allow creating a guest from a secondary user...
2014-09-17 20:50:55 +00:00
Amith Yamasani
befe3c6ff7
am c7ab2db7
: am 80a1ced5
: am 69b67465
: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit 'c7ab2db7dfd6526318da0ae06384dec8e1d79e25':
Don't allow creating a guest from a secondary user...
2014-09-17 20:39:13 +00:00
Amith Yamasani
c7ab2db7df
am 80a1ced5
: am 69b67465
: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit '80a1ced5b22a24e472c4c465c8fcb8dca7a74da8':
Don't allow creating a guest from a secondary user...
2014-09-17 20:27:03 +00:00
Amith Yamasani
80a1ced5b2
am 69b67465
: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit '69b674656af869219189fe0f7985c011d29d9b7e':
Don't allow creating a guest from a secondary user...
2014-09-17 20:16:44 +00:00
John Spurlock
f1f11b5b25
am 7cd016e3
: am 7dfc3540
: am 0f01eb7f
: am ae9d437b
: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit '7cd016e3e0a6256b38f3f64423c0d90e63a873bc':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 20:10:04 +00:00
Amith Yamasani
69b674656a
Merge "Don't allow creating a guest from a secondary user..." into lmp-dev
2014-09-17 20:06:59 +00:00
John Spurlock
7cd016e3e0
am 7dfc3540
: am 0f01eb7f
: am ae9d437b
: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit '7dfc3540a33c0bf53227db86ce193dc8ef0f02f4':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 20:01:36 +00:00
John Spurlock
7dfc3540a3
am 0f01eb7f
: am ae9d437b
: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit '0f01eb7f1ad7939753633becfafc67f2446c9318':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:53:47 +00:00
John Spurlock
0f01eb7f1a
am ae9d437b
: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:48:26 +00:00
John Spurlock
ae9d437b4a
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
2014-09-17 19:37:27 +00:00
PauloftheWest
f03f6ab376
am ed9fd0dd
: am 01de9832
: am b2737bc0
: am 3cc81aea
: Increase char limit for translation.
...
* commit 'ed9fd0ddeda4a3be5f60745af99b8a80460afcae':
Increase char limit for translation.
2014-09-17 19:09:08 +00:00
PauloftheWest
ed9fd0dded
am 01de9832
: am b2737bc0
: am 3cc81aea
: Increase char limit for translation.
...
* commit '01de98321a8485d3aa943976f8192caccba50887':
Increase char limit for translation.
2014-09-17 18:56:18 +00:00
PauloftheWest
01de98321a
am b2737bc0
: am 3cc81aea
: Increase char limit for translation.
...
* commit 'b2737bc028cdfc72e81b45b149dc8adde639b6ac':
Increase char limit for translation.
2014-09-17 18:36:39 +00:00
PauloftheWest
b2737bc028
am 3cc81aea
: Increase char limit for translation.
...
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
2014-09-17 18:27:04 +00:00
John Spurlock
2c52651577
Settings: Ensure CryptKeeper dismisses secure keyguards.
...
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.
Bug:17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
2014-09-17 13:33:38 -04:00
PauloftheWest
3cc81aeabf
Increase char limit for translation.
...
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
2014-09-17 08:30:09 -07:00
Maurice Lam
5130a2e453
am 670e1e5e
: am ac115451
: am 7fc505a1
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '670e1e5e5a7e8aae7fbac3e798d7508d2452707d':
[WifiSetup] Update connection state for auto-finish
2014-09-17 05:15:18 +00:00
Baligh Uddin
0bb9427b4a
am c6954436
: (-s ours) am bbaad6b9
: (-s ours) am 453053db
: (-s ours) am 09a11d5b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c6954436fb5b605525ac4ca3c6a47dfa4264dc70':
Import translations. DO NOT MERGE
2014-09-17 05:13:08 +00:00
PauloftheWest
3244c683a2
am 2aed3a5e
: am ebb04444
: am 9e7073ae
: am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit '2aed3a5ef7c63a29102b405681e0ae15337097d0':
Alignment updates for Wi-Fi Settings dialog.
2014-09-17 05:13:07 +00:00
Edward Jee
96d840fc12
am 78189c64
: am a17545fa
: am c64a51cb
: am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit '78189c647e5af5405b9eb142ff6f2f4ca82e6134':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-17 05:13:06 +00:00
Edward Jee
3c4f081f59
am 69010fb1
: 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 '69010fb13af1de42e17e78772c5f85bb1fa28374':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-17 05:13:04 +00:00
PauloftheWest
b268fad47e
am 3724edb3
: am f4713e0f
: am 99f7d73b
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '3724edb357230c226f1c2b21c5795a97281022f3':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-17 05:13:02 +00:00
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
Baligh Uddin
422deeb2fb
Import translations. DO NOT MERGE
...
Change-Id: I74adcddc2559efb083c46667f51b7849dd0cf952
Auto-generated-cl: translation import
2014-09-16 20:52:09 -07:00
Baligh Uddin
7107f3e324
Import translations. DO NOT MERGE
...
Change-Id: Iac811e557bb7b8e9910ff7e9cdcdefad13c99f8a
Auto-generated-cl: translation import
2014-09-16 20:48:40 -07: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
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
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
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
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