Jim Miller
9d25005e7a
Show trust agent entries as disabled rather than removing them.
...
Fixes bug 17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
2014-08-21 19:46:26 -07:00
Maurice Lam
103c33145c
am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
...
* commit '8be27595766a632da8ef78a0a8eaa8dc041232d8':
[WifiSetup] Tablet portrait layout
2014-08-22 01:34:31 +00:00
Maurice Lam
8be2759576
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
2014-08-22 01:22:25 +00:00
Paul Lawrence
0f11e15f50
Honor hide pattern on crypto screen
...
Also clear pattern a little more quickly, and show owner info
even from before encrypting (since we're fixing pattern visible,
we should fix owner info too in the same way)
Bug: 17059314
Change-Id: Ie9ccd4a892a1dec32ebe60567d3b72dd6fe25060
2014-08-21 15:41:42 -07:00
Amith Yamasani
93ed43524d
am 727b53ad: am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '727b53adecc436a91cb7333a59152305b93f94cd':
Fix layout of Apn Settings screen
2014-08-21 21:23:52 +00:00
Amith Yamasani
727b53adec
am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '8cf1ec351f9d1c666219878f2f753fc738e44bc2':
Fix layout of Apn Settings screen
2014-08-21 21:13:16 +00:00
Amith Yamasani
8cf1ec351f
am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
Fix layout of Apn Settings screen
2014-08-21 21:03:27 +00:00
Amith Yamasani
2534be3746
Merge "Fix layout of Apn Settings screen" into lmp-dev
2014-08-21 20:51:44 +00:00
Amith Yamasani
ce3cd9df9b
Fix layout of Apn Settings screen
...
Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
2014-08-21 13:30:35 -07:00
PauloftheWest
2b41c90fed
Removed the Wi-Fi icon shown when Wi-Fi is off.
...
Bug: 16570104
Change-Id: Iacee07c225f6609b92f1df193b682fde0a720a92
2014-08-21 11:57:29 -07:00
Kenny Guy
2c7addd8ab
am 38afb092: am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '38afb092aecc5585d75ef3d5e54129d3600d1ae6':
Disable non-permitted accessibility services and IMEs
2014-08-21 18:15:56 +00:00
Kenny Guy
38afb092ae
am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '100d45ec09da85055c7f5e2019c5aba54e986f37':
Disable non-permitted accessibility services and IMEs
2014-08-21 18:05:51 +00:00
Kenny Guy
100d45ec09
am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
Disable non-permitted accessibility services and IMEs
2014-08-21 17:57:32 +00:00
Kenny Guy
66b0d9e809
Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
2014-08-21 17:44:25 +00:00
Diego Pontoriero
069d757ece
am cac56aa3: am ab3da46a: am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
...
* commit 'cac56aa307bfbb6afcc002c530bab76b4848a548':
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
2014-08-21 17:06:01 +00:00
PauloftheWest
8a313b9dd7
am c4f3ee7b: am e0a0fa7c: am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
...
* commit 'c4f3ee7b27e36c21273e95d1ee9a392737e1660f':
Fixed a crash when sharing video through Bluetooth.
2014-08-21 16:54:05 +00:00
Diego Pontoriero
cac56aa307
am ab3da46a: am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
...
* commit 'ab3da46ac1ee1ec3bdfe0d58b510095f9626b1b5':
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
2014-08-21 16:52:19 +00:00
PauloftheWest
c4f3ee7b27
am e0a0fa7c: am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
...
* commit 'e0a0fa7cec8a91a15c72468f6fa42bbe67a31493':
Fixed a crash when sharing video through Bluetooth.
2014-08-21 16:41:58 +00:00
Diego Pontoriero
ab3da46ac1
am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
...
* commit 'dbfd04d80abb4bb605ebd517d52137108cc24d6d':
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
2014-08-21 16:41:56 +00:00
Diego Pontoriero
dbfd04d80a
Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
2014-08-21 16:34:37 +00:00
PauloftheWest
e0a0fa7cec
am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
...
* commit '98f61b71ac182d87256ea21e770b57c1168d1472':
Fixed a crash when sharing video through Bluetooth.
2014-08-21 16:31:05 +00:00
PauloftheWest
98f61b71ac
Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
2014-08-21 16:24:11 +00:00
Kenny Guy
333f2bc71a
Disable non-permitted accessibility services and IMEs
...
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
2014-08-21 17:15:49 +01:00
PauloftheWest
b358f6d0f2
Fixed a crash when sharing video through Bluetooth.
...
+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.
Bug: 17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
2014-08-21 08:18:30 -07:00
vandwalle
1325cde4c2
am 8e4e0e4b: am 500510ad: am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
...
* commit '8e4e0e4b84e6de7e03cc6a60fbfcdfb64cabcd32':
rename ScanResult.status -> autoJoinStatus
2014-08-21 15:16:35 +00:00
vandwalle
8e4e0e4b84
am 500510ad: am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
...
* commit '500510ad5c6cf60b078c61fc7831c31bd5e521be':
rename ScanResult.status -> autoJoinStatus
2014-08-21 15:11:21 +00:00
vandwalle
500510ad5c
am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
...
* commit '10673f1a1e330cf20ddab04fbc09cce3f18d111d':
rename ScanResult.status -> autoJoinStatus
2014-08-21 15:02:24 +00:00
vandwalle
10673f1a1e
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
2014-08-21 14:55:45 +00:00
Jessica Hummel
9dff428485
am 1cba7345: am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit '1cba7345801050c90652beed852d7209b7a948b9':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 13:39:29 +00:00
Alexandra Gherghina
75783290b6
Modify Spinner so that the arrow is closer to the text
...
Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
2014-08-21 12:44:55 +01:00
Jessica Hummel
1cba734580
am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit 'a477e8910c948ce53b9069e214e51b2a38d69d2f':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 11:44:48 +00:00
Jessica Hummel
a477e8910c
am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 11:35:04 +00:00
Jessica Hummel
ff2da2cdb3
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d9035ef969
am 389bea96: am d925c995: am fe3794a9: Remove "Choose Keyboards" settings
...
* commit '389bea96d92ee162d5bb286884f9e536baca05c2':
Remove "Choose Keyboards" settings
2014-08-21 05:16:19 +00:00
Tadashi G. Takaoka
389bea96d9
am d925c995: am fe3794a9: Remove "Choose Keyboards" settings
...
* commit 'd925c9952dad2302d30b91ddb1dbe0fedd756f7e':
Remove "Choose Keyboards" settings
2014-08-21 04:26:38 +00:00
Tadashi G. Takaoka
d925c9952d
am fe3794a9: Remove "Choose Keyboards" settings
...
* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
Remove "Choose Keyboards" settings
2014-08-21 04:15:26 +00:00
Jeff Davidson
7864bfd91f
am 0003b29c: am b5566ca7: am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
...
* commit '0003b29cdac5c7294ce5d2852e2a8121b7e09cfc':
Suppress WiFi Assistant card until future platform updates.
2014-08-21 04:10:41 +00:00
Jeff Davidson
d4f0bea64f
am deb9cf1a: am a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev
...
* commit 'deb9cf1abb547506b7eeeb81021b6e35cc7d0667':
Less intrusive VPN dialog.
2014-08-21 04:10:40 +00:00
PauloftheWest
620560789c
am 349f7bce: am 8f60bf4c: am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
...
* commit '349f7bcee834d6e3eb90d74f007ed3767bd19300':
Added a default Bluetooth icon for Bluetooth Preferences.
2014-08-21 04:10:39 +00:00
PauloftheWest
a058657764
am 9b0d876d: am 98d0f8ca: am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
...
* commit '9b0d876d50fdde680d74225b4f99762db4135e8e':
Fixed a Bluetooth Scanning issue.
2014-08-21 04:10:38 +00:00
Amith Yamasani
56635ebd5f
am 05ff676f: am 6879169f: am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev
...
* commit '05ff676f5cf426bd054e624354b7e91418a7a5ef':
Update string for profile owner addition warning
2014-08-21 04:10:37 +00:00
Maurice Lam
1677b3e3d4
[WifiSetup] Tablet portrait layout
...
Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
2014-08-20 20:36:03 -07:00
Jeff Davidson
0003b29cda
am b5566ca7: am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
...
* commit 'b5566ca7a9b8c099cc71aedbbb2719dc35c23852':
Suppress WiFi Assistant card until future platform updates.
2014-08-21 03:06:21 +00:00
Jeff Davidson
deb9cf1abb
am a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev
...
* commit 'a5db8ba5afd669de607cc7db2578927476aed12a':
Less intrusive VPN dialog.
2014-08-21 03:02:10 +00:00
PauloftheWest
349f7bcee8
am 8f60bf4c: am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
...
* commit '8f60bf4cadc7381deeb553150a1705b3b31e116b':
Added a default Bluetooth icon for Bluetooth Preferences.
2014-08-21 02:56:27 +00:00
PauloftheWest
9b0d876d50
am 98d0f8ca: am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
...
* commit '98d0f8ca2d38ba9cc6fd14eee728abed41431038':
Fixed a Bluetooth Scanning issue.
2014-08-21 02:48:15 +00:00
Amith Yamasani
05ff676f5c
am 6879169f: am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev
...
* commit '6879169fe928712e66269c75e0b91135eb675a11':
Update string for profile owner addition warning
2014-08-21 02:47:45 +00:00
Tadashi G. Takaoka
fe3794a937
Remove "Choose Keyboards" settings
...
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
2014-08-21 11:41:57 +09:00
PauloftheWest
945242f8c9
am 3f6a50ba: am 0233d732: am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev
...
* commit '3f6a50ba82c661a2b745297722446a517b94cba0':
Fixed a Settings dialog crash.
2014-08-21 00:56:59 +00:00
John Spurlock
efffa590df
am 1189e70b: am 1bc2ff2b: am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
...
* commit '1189e70be4e052576cd721ecbb4801b53b457fa2':
Settings: Remove needless dialogTitle attribute.
2014-08-21 00:56:58 +00:00