OSDN Git Service
John Spurlock [Wed, 17 Sep 2014 20:10:04 +0000 (20:10 +0000)]
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.
John Spurlock [Wed, 17 Sep 2014 20:01:36 +0000 (20:01 +0000)]
am
7dfc3540: am
0f01eb7f: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
7dfc3540a33c0bf53227db86ce193dc8ef0f02f4':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:53:47 +0000 (19:53 +0000)]
am
0f01eb7f: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
0f01eb7f1ad7939753633becfafc67f2446c9318':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:48:26 +0000 (19:48 +0000)]
am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
PauloftheWest [Wed, 17 Sep 2014 19:09:08 +0000 (19:09 +0000)]
am
ed9fd0dd: am
01de9832: am
b2737bc0: am
3cc81aea: Increase char limit for translation.
* commit '
ed9fd0ddeda4a3be5f60745af99b8a80460afcae':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:56:18 +0000 (18:56 +0000)]
am
01de9832: am
b2737bc0: am
3cc81aea: Increase char limit for translation.
* commit '
01de98321a8485d3aa943976f8192caccba50887':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:36:39 +0000 (18:36 +0000)]
am
b2737bc0: am
3cc81aea: Increase char limit for translation.
* commit '
b2737bc028cdfc72e81b45b149dc8adde639b6ac':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:27:04 +0000 (18:27 +0000)]
am
3cc81aea: Increase char limit for translation.
* commit '
3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
John Spurlock [Wed, 17 Sep 2014 16:55:17 +0000 (12:55 -0400)]
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
PauloftheWest [Wed, 17 Sep 2014 15:30:09 +0000 (08:30 -0700)]
Increase char limit for translation.
Bug:
17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
Maurice Lam [Wed, 17 Sep 2014 05:15:18 +0000 (05:15 +0000)]
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
Baligh Uddin [Wed, 17 Sep 2014 05:13:08 +0000 (05:13 +0000)]
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
PauloftheWest [Wed, 17 Sep 2014 05:13:07 +0000 (05:13 +0000)]
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.
Edward Jee [Wed, 17 Sep 2014 05:13:06 +0000 (05:13 +0000)]
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.
Edward Jee [Wed, 17 Sep 2014 05:13:04 +0000 (05:13 +0000)]
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.
PauloftheWest [Wed, 17 Sep 2014 05:13:02 +0000 (05:13 +0000)]
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.
Dianne Hackborn [Wed, 17 Sep 2014 05:13:01 +0000 (05:13 +0000)]
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.
Dianne Hackborn [Wed, 17 Sep 2014 05:13:00 +0000 (05:13 +0000)]
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
Maurice Lam [Wed, 17 Sep 2014 05:12:58 +0000 (05:12 +0000)]
am
9bfbf642: am
24956de0: am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
9bfbf6426bff4c7b8b074f0701dbf539b6c34b51':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 21:03:12 +0000 (21:03 +0000)]
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.
Prem Kumar [Tue, 16 Sep 2014 20:32:54 +0000 (20:32 +0000)]
am
02f66ba7: am
07e5ea99: am
319e7a27: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
02f66ba78c67567275fca7fd994a9d3df023befe':
John Spurlock [Tue, 16 Sep 2014 20:31:48 +0000 (20:31 +0000)]
am
c9f6945f: am
be0827dd: am
f97ec546: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
c9f6945fc80511de36c6e7029b49a0d322b9aaa5':
Tyler Gunn [Tue, 16 Sep 2014 20:29:45 +0000 (20:29 +0000)]
Maurice Lam [Tue, 16 Sep 2014 19:09:34 +0000 (19:09 +0000)]
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
Maurice Lam [Tue, 16 Sep 2014 18:57:34 +0000 (18:57 +0000)]
am
7fc505a1: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
7fc505a1ca9ba65b95189187bc3bde78258be547':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:46:36 +0000 (18:46 +0000)]
am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:35:38 +0000 (18:35 +0000)]
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
Maurice Lam [Tue, 16 Sep 2014 03:40:26 +0000 (20:40 -0700)]
[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
Baligh Uddin [Tue, 16 Sep 2014 17:18:18 +0000 (17:18 +0000)]
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
PauloftheWest [Tue, 16 Sep 2014 17:18:17 +0000 (17:18 +0000)]
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.
Edward Jee [Tue, 16 Sep 2014 17:18:16 +0000 (17:18 +0000)]
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.
Edward Jee [Tue, 16 Sep 2014 17:18:15 +0000 (17:18 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 17:18:15 +0000 (17:18 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 17:18:14 +0000 (17:18 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 17:18:13 +0000 (17:18 +0000)]
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
Maurice Lam [Tue, 16 Sep 2014 17:18:12 +0000 (17:18 +0000)]
am
24956de0: am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
24956de0e0405ee3165d289ce74a87e70855b46b':
[WifiSetup] Disable app starting window
Baligh Uddin [Tue, 16 Sep 2014 16:50:33 +0000 (16:50 +0000)]
am
453053db: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
453053dbcd97bede894e1354e8153039c06a17bb':
Import translations. DO NOT MERGE
PauloftheWest [Tue, 16 Sep 2014 16:47:35 +0000 (16:47 +0000)]
am
9e7073ae: am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
9e7073aeb9c5ba03fe6d4f4a46a07a20eefad887':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 16:47:35 +0000 (16:47 +0000)]
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.
Edward Jee [Tue, 16 Sep 2014 16:47:34 +0000 (16:47 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 16:47:33 +0000 (16:47 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 16:47:32 +0000 (16:47 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 16:47:31 +0000 (16:47 +0000)]
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
Maurice Lam [Tue, 16 Sep 2014 16:47:30 +0000 (16:47 +0000)]
am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
95b283aabd26a757bc80abf6beff36346d15b20b':
[WifiSetup] Disable app starting window
Baligh Uddin [Tue, 16 Sep 2014 15:26:43 +0000 (15:26 +0000)]
am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE
Paul Lawrence [Tue, 16 Sep 2014 15:21:16 +0000 (15:21 +0000)]
am
36d8bd3b: am
db51c76a: am
7f4c4fb5: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
36d8bd3bf7267f38af9f53be7bce70d93b5f3bfa':
Kenny Guy [Tue, 16 Sep 2014 15:21:15 +0000 (15:21 +0000)]
am
daa4a466: am
28d2fa62: am
1ede808c: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
daa4a46633cc1175a8dcb3a60fe968d088dee377':
Alexandra Gherghina [Tue, 16 Sep 2014 15:21:14 +0000 (15:21 +0000)]
am
7a09535c: am
cd321d81: am
69af2c6a: am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
7a09535c734cb9da9dcf66bef8b5265f0f65882a':
PauloftheWest [Tue, 16 Sep 2014 15:21:13 +0000 (15:21 +0000)]
am
e438c383: am
6c1d69ba: am
9f96ac6f: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
e438c38323f9e3132110ab561235b766d5e800c0':
Dianne Hackborn [Tue, 16 Sep 2014 15:21:12 +0000 (15:21 +0000)]
am
f7acc1b3: am
c857cddf: am
364ca371: am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
f7acc1b3115bee7536804ee77579eb213db67525':
Svetoslav [Tue, 16 Sep 2014 15:21:11 +0000 (15:21 +0000)]
am
0a91a8d2: am
c33aef20: am
c50841ca: am
85dcef12: Fix settings crash in print job screen.
* commit '
0a91a8d24dd7098d31410f14a36067a7fe963ff4':
Vinit Deshpande [Tue, 16 Sep 2014 15:21:10 +0000 (15:21 +0000)]
am
84912814: am
7aaccec0: am
c471629c: am
0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
84912814f50934ddb8e6c968d829a00873037bb2':
Svetoslav [Tue, 16 Sep 2014 15:21:09 +0000 (15:21 +0000)]
am
9af0fce6: am
536cb798: am
842e9d04: am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
9af0fce66a9262c5563a588dbc998f451ca40469':
Carlos Valdivia [Tue, 16 Sep 2014 15:21:08 +0000 (15:21 +0000)]
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':
Baligh Uddin [Tue, 16 Sep 2014 15:21:08 +0000 (15:21 +0000)]
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':
Dan Sandler [Tue, 16 Sep 2014 15:21:07 +0000 (15:21 +0000)]
am
fecd8989: am
99e467a7: am
e98bee54: am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
fecd8989854aaf09fd5f761ac863e116534e9177':
Zoltan Szatmary-Ban [Tue, 16 Sep 2014 15:21:06 +0000 (15:21 +0000)]
am
bc8f3d08: am
118cf516: am
55cd479d: am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
Zoltan Szatmary-Ban [Tue, 16 Sep 2014 15:21:05 +0000 (15:21 +0000)]
am
23496243: am
b2259b3a: am
b46eeeb7: am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
Fabrice Di Meglio [Tue, 16 Sep 2014 15:21:04 +0000 (15:21 +0000)]
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':
PauloftheWest [Tue, 16 Sep 2014 15:21:03 +0000 (15:21 +0000)]
am
08455c57: am
c1806600: am
23d0ac44: am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
08455c5791f706f8d55cd08a96375a209597d5d5':
Jim Miller [Tue, 16 Sep 2014 15:21:02 +0000 (15:21 +0000)]
am
0787af48: am
825eb63c: am
f496ae94: am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
0787af48c7efa96ba3fa5a44b8686428e9f020a6':
Baligh Uddin [Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)]
am
c742cfc7: (-s ours) am
6f96fcc5: (-s ours) am
321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
Import translations. DO NOT MERGE
PauloftheWest [Tue, 16 Sep 2014 15:21:00 +0000 (15:21 +0000)]
am
52e19465: am
1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '
52e1946554a45b6034bcf23ed46f3033fe843129':
John Spurlock [Tue, 16 Sep 2014 15:20:59 +0000 (15:20 +0000)]
am
315e0a4a: am
31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '
315e0a4a9e0a87972f7e5e8e850a226bdf90d83a':
PauloftheWest [Tue, 16 Sep 2014 15:20:58 +0000 (15:20 +0000)]
am
4708092e: am
8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '
4708092e4f1b9538ddd8e3fc797ad184eea78233':
Jason Monk [Tue, 16 Sep 2014 15:20:57 +0000 (15:20 +0000)]
Fabrice Di Meglio [Tue, 16 Sep 2014 15:20:56 +0000 (15:20 +0000)]
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':
John Spurlock [Tue, 16 Sep 2014 15:20:55 +0000 (15:20 +0000)]
am
417b8261: am
1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '
417b826176e1b88ef640518eaed639726a84e9ec':
John Spurlock [Tue, 16 Sep 2014 15:20:54 +0000 (15:20 +0000)]
am
0ed4f5b7: am
cddb2954: Settings: Make downtime days scrollable.
* commit '
0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':
Matthew Xie [Tue, 16 Sep 2014 15:20:52 +0000 (15:20 +0000)]
am
a5d4c1b2: am
72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '
a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':
Carlos Valdivia [Tue, 16 Sep 2014 15:20:51 +0000 (15:20 +0000)]
am
cece1cb2: am
af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '
cece1cb20899394cd1710f5d02aa7fdacedaf653':
Elliott Hughes [Tue, 16 Sep 2014 15:20:50 +0000 (15:20 +0000)]
am
6312a721: am
a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '
6312a72136458287c467a224bb6e19ac9eedb203':
Jorim Jaggi [Tue, 16 Sep 2014 15:20:48 +0000 (15:20 +0000)]
am
723abba6: am
b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '
723abba6c5315390cfdada773987d9522b7b1038':
Baligh Uddin [Tue, 16 Sep 2014 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Tue, 16 Sep 2014 08:31:59 +0000 (08:31 +0000)]
am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 08:31:59 +0000 (08:31 +0000)]
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.
Edward Jee [Tue, 16 Sep 2014 08:31:58 +0000 (08:31 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 08:31:57 +0000 (08:31 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:31:56 +0000 (08:31 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:31:55 +0000 (08:31 +0000)]
am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 08:31:54 +0000 (08:31 +0000)]
am
795511ec: [WifiSetup] Disable app starting window
* commit '
795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:29:09 +0000 (08:29 +0000)]
am
7b03a452: am
dc985292: am
13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '
7b03a45227a304b9407e565994c491dbee64e4cd':
Updated Wi-Fi Settings icons to new filled-in teal format.
PauloftheWest [Tue, 16 Sep 2014 02:13:29 +0000 (02:13 +0000)]
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
Edward Jee [Mon, 8 Sep 2014 23:45:29 +0000 (16:45 -0700)]
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
Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 23:56:07 +0000 (23:56 +0000)]
am
56b3f338: am
654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '
56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
Amith Yamasani [Mon, 15 Sep 2014 23:56:06 +0000 (23:56 +0000)]
am
b8931381: am
67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '
b89313812dbefe68ac48b06e3ca9c603c42cae1c':
Adam Lesinski [Mon, 15 Sep 2014 23:56:05 +0000 (23:56 +0000)]
am
98739309: am
3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '
98739309e15e1437f15d92872712fe05ba29a4dc':
PauloftheWest [Mon, 15 Sep 2014 23:56:04 +0000 (23:56 +0000)]
am
4cf6dcf6: am
29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '
4cf6dcf6aff003cc4d294275209cb3987c07775f':
Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:56:03 +0000 (23:56 +0000)]
am
dbcfc1b7: am
574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '
dbcfc1b73678e53bf89d11c5c4fe47a74f4508a7':
Elliott Hughes [Mon, 15 Sep 2014 23:56:00 +0000 (23:56 +0000)]
am
bce031b0: am
5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '
bce031b0ad16c0ba127627ca7231d872d23ce9c3':
PauloftheWest [Mon, 15 Sep 2014 23:55:59 +0000 (23:55 +0000)]
am
5dcec205: am
bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '
5dcec20557353a79aaa97e113583507b4f1a7433':
PauloftheWest [Mon, 15 Sep 2014 23:55:58 +0000 (23:55 +0000)]
am
91f76560: am
e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '
91f76560f80f006ce704f80f21400d91ffe43e89':
PauloftheWest [Mon, 15 Sep 2014 23:55:57 +0000 (23:55 +0000)]
am
9128659b: am
d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '
9128659be872890927291c30df781d3522d34a1e':
Andres Morales [Mon, 15 Sep 2014 23:55:51 +0000 (23:55 +0000)]
am
a40a9a90: am
4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit '
a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':
PauloftheWest [Mon, 15 Sep 2014 23:55:50 +0000 (23:55 +0000)]
am
5c86c955: am
5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '
5c86c9551388e85b172a8305a0e9dd79ef025785':
Alan Viverette [Mon, 15 Sep 2014 23:55:49 +0000 (23:55 +0000)]
am
ce7c0337: am
01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '
ce7c0337202bbf063a50e6436c246b35949ae0c3':
vandwalle [Mon, 15 Sep 2014 23:55:48 +0000 (23:55 +0000)]
am
4d5ddf0c: am
c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '
4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:47 +0000 (23:55 +0000)]
am
c210a3f2: am
edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit '
c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':
OSDN Git Service
