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
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
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
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
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
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
PauloftheWest
ab9fe9d3e6
am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
...
* commit '4708092e4f1b9538ddd8e3fc797ad184eea78233':
2014-09-16 15:20:58 +00:00
Jason Monk
aef243e64e
am c80014fb: am 062f736c: Adding zen mode condition dialog
...
* commit 'c80014fbbbfbefaab96aeffd9dd585801bd8d0e9':
2014-09-16 15:20:57 +00:00
Fabrice Di Meglio
315ae7930d
am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
...
* commit '743400b466ad6459fe01a35596bf7478695cee57':
2014-09-16 15:20:56 +00:00
John Spurlock
0c91e31da8
am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime.
...
* commit '417b826176e1b88ef640518eaed639726a84e9ec':
2014-09-16 15:20:55 +00:00
John Spurlock
0ea17d3b05
am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable.
...
* commit '0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':
2014-09-16 15:20:54 +00:00
Matthew Xie
1b80bbc7bb
am a5d4c1b2: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
...
* commit 'a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':
2014-09-16 15:20:52 +00:00
Carlos Valdivia
418c900f94
am cece1cb2: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
...
* commit 'cece1cb20899394cd1710f5d02aa7fdacedaf653':
2014-09-16 15:20:51 +00:00
Elliott Hughes
0541c7ab1b
am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
...
* commit '6312a72136458287c467a224bb6e19ac9eedb203':
2014-09-16 15:20:50 +00:00
Jorim Jaggi
8e73e6c436
am 723abba6: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
...
* commit '723abba6c5315390cfdada773987d9522b7b1038':
2014-09-16 15:20:48 +00:00
Baligh Uddin
09a11d5bf4
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:16:37 +00:00
PauloftheWest
79c32a04b5
am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 09:07:08 +00:00
Edward Jee
1386bd9873
am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 09:07:07 +00:00
Edward Jee
170be5c8c8
am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 09:07:06 +00:00
PauloftheWest
88f7fa0b9e
am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 09:07:05 +00:00
Dianne Hackborn
1e6b685828
am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 09:07:04 +00:00
Dianne Hackborn
0f4c5f15a0
am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 09:07:03 +00:00
Maurice Lam
e1300a2c9b
am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window
...
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
2014-09-16 09:07:02 +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
PauloftheWest
9b6f42b309
am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:30:51 +00: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
771fd894b7
am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
...
* commit '56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
2014-09-15 23:56:07 +00:00
Amith Yamasani
9c5104e610
am b8931381: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
...
* commit 'b89313812dbefe68ac48b06e3ca9c603c42cae1c':
2014-09-15 23:56:06 +00:00
Adam Lesinski
53a09c2711
am 98739309: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
...
* commit '98739309e15e1437f15d92872712fe05ba29a4dc':
2014-09-15 23:56:05 +00:00
PauloftheWest
c8733c8a18
am 4cf6dcf6: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
...
* commit '4cf6dcf6aff003cc4d294275209cb3987c07775f':
2014-09-15 23:56:04 +00:00