Commit Graph

7510 Commits

Author SHA1 Message Date
Amith Yamasani
4344fe0766 Add a tablet-specific string to describe NFC checkbox.
Bug: 6480832
Change-Id: I94e7baeba52528819ace8db7750ff2b7e114938a
2012-05-11 10:16:11 -07:00
Kenny Root
f543a71e7a WiFi: only send engine setting when key_id is set
For EAP methods that don't need a key, don't set the engine settings or
else wpa_supplicant will have an error. Instead, look to see whether
key_id is set and use that to indicate when the engine should be
set.

Additionally, don't require keystore when key_id is not null but is
still an empty string.

Bug: 6480500
Change-Id: I137de47dfcbbd3da24d693701e249e15d7528228
2012-05-11 10:02:19 -07:00
Eric Fischer
7890e231d8 Merge "Import translations. DO NOT MERGE" 2012-05-11 09:28:58 -07:00
satok
5992173a74 am 61dff255: am e508dc25: Fix the crash during opning the illegal settings of the spell checker
* commit '61dff255d00a734567dd9c71c9b0647460818e8b':
  Fix the crash during opning the illegal settings of the spell checker
2012-05-11 03:33:41 -07:00
satok
61dff255d0 am e508dc25: Fix the crash during opning the illegal settings of the spell checker
* commit 'e508dc25f2d3168f37fe5963fc99b0a034a3a298':
  Fix the crash during opning the illegal settings of the spell checker
2012-05-11 03:31:28 -07:00
satok
e508dc25f2 Fix the crash during opning the illegal settings of the spell checker
Bug: 5591245
Change-Id: I4ff61a59b0622c74b34bc50a00fc9773c04a6395
2012-05-11 18:52:02 +09:00
Amith Yamasani
4b7634451a am 0fe4812a: am ee10cecc: Merge "Use Spinner instead of Tabs, so that a 4th entry doesn\'t disappear off the screen." into jb-dev
* commit '0fe4812afa1848b02dd13eef2a253c2a99e92fff':
  Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
2012-05-10 15:58:18 -07:00
Amith Yamasani
0fe4812afa am ee10cecc: Merge "Use Spinner instead of Tabs, so that a 4th entry doesn\'t disappear off the screen." into jb-dev
* commit 'ee10ceccde8155016af557e96c9ac6a6e2bb477d':
  Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
2012-05-10 15:56:32 -07:00
Amith Yamasani
ee10ceccde Merge "Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen." into jb-dev 2012-05-10 15:53:47 -07:00
Eric Fischer
4d2bccc550 am 15ecae45: (-s ours) am 2f3b5314: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '15ecae45d75441564997ab04a9f0eabc52235391':
  Import translations. DO NOT MERGE
2012-05-10 15:46:52 -07:00
Eric Fischer
15ecae45d7 am 2f3b5314: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '2f3b5314333b36e1fbc058a70a7ec89cec7f96d4':
  Import translations. DO NOT MERGE
2012-05-10 15:43:03 -07:00
Eric Fischer
2f3b531433 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:40:45 -07:00
Amith Yamasani
7a3221bb95 Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
This is for the 3 to 4 lists that you can switch between in the Settings->Apps
screen.

Bug: 6375122

Change-Id: I8a4e46b8aa3e06bc79edb5f65400462060fe5a29
2012-05-10 15:18:25 -07:00
Russell Brenner
d7126a01a9 am 776cf39e: am 37088515: Change title to "Select Wi-Fi"
* commit '776cf39e384c739bf9aeb63de17f0794a16a8955':
  Change title to "Select Wi-Fi"
2012-05-10 14:48:43 -07:00
Russell Brenner
776cf39e38 am 37088515: Change title to "Select Wi-Fi"
* commit '37088515bf8d8d57aae03a27427fd3450d7d65f9':
  Change title to "Select Wi-Fi"
2012-05-10 14:45:42 -07:00
Eric Fischer
9a40976754 Import translations. DO NOT MERGE
Change-Id: I6bcdcf1982414140e547d14cf4dcc586467fed2e
2012-05-10 14:32:03 -07:00
Eric Fischer
9cc268efe5 Import translations. DO NOT MERGE
Change-Id: Ie7165c02d6c1dff54464cdaa4121cc7364db0891
2012-05-10 14:30:18 -07:00
Russell Brenner
37088515bf Change title to "Select Wi-Fi"
Bug: 6471984
Change-Id: I91f9d49e61a4a6e0ee177a7a6304613324357426
2012-05-10 09:54:16 -07:00
Jean Chalard
32e7c87764 am 8f266e9b: am 7dabe458: Fix breadcrumbs for user dictionary settings on tablets.
* commit '8f266e9b5ecd3f9561ee5ef81aa398c12b0c164b':
  Fix breadcrumbs for user dictionary settings on tablets.
2012-05-10 09:31:07 -07:00
Jean Chalard
eae1d0e977 am faf14a81: am eed02dd2: Fix a bug with adding a word
* commit 'faf14a817a1bc0bf8c79c29495b466063ce7e979':
  Fix a bug with adding a word
2012-05-10 09:31:07 -07:00
Jean Chalard
3943bea65a am 5d25f668: am 27154387: Implement the "more locales" feature.
* commit '5d25f66865d86ac94d923edab427caeab640d65a':
  Implement the "more locales" feature.
2012-05-10 09:31:06 -07:00
Jean Chalard
2f7167a27f am 68a852cf: am eb995c79: Merge "Fix a bug with a duplicate entry" into jb-dev
* commit '68a852cf8f92be8fae6f6078f075a98187b8b492':
  Fix a bug with a duplicate entry
2012-05-10 09:31:05 -07:00
Jean Chalard
12a7f19f8d am fe300b0a: am cfed94a6: Merge "Implement the delete button for user words" into jb-dev
* commit 'fe300b0ae5652caf016c09059c98b1908eb361de':
  Implement the delete button for user words
2012-05-10 09:31:05 -07:00
Russell Brenner
7c9e5afce7 am 08e36e17: am 7ff82ad4: Merge "Include Add Network button for Setup Wizard" into jb-dev
* commit '08e36e1769eafd144699b99bba51358452b39e98':
  Include Add Network button for Setup Wizard
2012-05-10 09:31:04 -07:00
Russell Brenner
e680d58aa8 am b7c6380e: am 33806e72: Merge "Change title to "Wi-Fi network"" into jb-dev
* commit 'b7c6380e3e20de063033f597c9849b6e1a62d0fe':
  Change title to "Wi-Fi network"
2012-05-10 09:31:04 -07:00
Dianne Hackborn
4518c253a8 am 71b9ef61: am 622fc7aa: Remove auto-brightness adjustment setting.
* commit '71b9ef6132d1c256afd08115ead8ddfd72416f09':
  Remove auto-brightness adjustment setting.
2012-05-10 09:31:03 -07:00
Dianne Hackborn
84886fcf28 am 10fba8a4: am 87ca7017: Tweak development settings to report system property changes.
* commit '10fba8a44a28bef0e812eeefa549551c0a1036a2':
  Tweak development settings to report system property changes.
2012-05-10 09:31:03 -07:00
Jean Chalard
8f266e9b5e am 7dabe458: Fix breadcrumbs for user dictionary settings on tablets.
* commit '7dabe4583c2bb12ed1d072139399f6bca8067994':
  Fix breadcrumbs for user dictionary settings on tablets.
2012-05-10 09:26:35 -07:00
Jean Chalard
faf14a817a am eed02dd2: Fix a bug with adding a word
* commit 'eed02dd2d51a876894f9f10023b1418ea6a45d8e':
  Fix a bug with adding a word
2012-05-10 09:26:32 -07:00
Jean Chalard
5d25f66865 am 27154387: Implement the "more locales" feature.
* commit '271543876d3ecccdb5547554778e91c9e7dd87ba':
  Implement the "more locales" feature.
2012-05-10 09:26:31 -07:00
Jean Chalard
68a852cf8f am eb995c79: Merge "Fix a bug with a duplicate entry" into jb-dev
* commit 'eb995c7939d6c471d41e606fd3d886ba72fc1851':
  Fix a bug with a duplicate entry
2012-05-10 09:26:28 -07:00
Jean Chalard
fe300b0ae5 am cfed94a6: Merge "Implement the delete button for user words" into jb-dev
* commit 'cfed94a65607fe9bb3387104c5368df31d73d04e':
  Implement the delete button for user words
2012-05-10 09:26:27 -07:00
Russell Brenner
08e36e1769 am 7ff82ad4: Merge "Include Add Network button for Setup Wizard" into jb-dev
* commit '7ff82ad4e06c8cf0339cc0bce0b54df9a2993a4f':
  Include Add Network button for Setup Wizard
2012-05-10 09:26:24 -07:00
Russell Brenner
b7c6380e3e am 33806e72: Merge "Change title to "Wi-Fi network"" into jb-dev
* commit '33806e72b03c763333723c0d4df50de9140a6e09':
  Change title to "Wi-Fi network"
2012-05-10 09:26:22 -07:00
Dianne Hackborn
71b9ef6132 am 622fc7aa: Remove auto-brightness adjustment setting.
* commit '622fc7aa5f1cf1a3840fb3777e731c6dc5f28d62':
  Remove auto-brightness adjustment setting.
2012-05-10 09:25:51 -07:00
Dianne Hackborn
10fba8a44a am 87ca7017: Tweak development settings to report system property changes.
* commit '87ca70172cc25ed2195d310b71d9c652a0757b88':
  Tweak development settings to report system property changes.
2012-05-10 09:24:09 -07:00
The Android Automerger
21c266f10d merge in jb-release history after reset to jb-dev 2012-05-10 07:05:27 -07:00
Jean Chalard
7dabe4583c Fix breadcrumbs for user dictionary settings on tablets.
Bug: 6026080
Change-Id: I1c0fa796c8f60e0c0f406e277d9e29fc09a44742
2012-05-10 18:56:09 +09:00
Jean Chalard
eed02dd2d5 Fix a bug with adding a word
It was possible to insert a word without a shortcut while the same
word used to be present with a shortcut. This change fixes that.

Bug: 6026080
Change-Id: I3be98bf450aad8e2eb38336e8f77aedab39d5797
2012-05-10 18:12:54 +09:00
Jean Chalard
271543876d Implement the "more locales" feature.
Bug: 6026080
Change-Id: I051a734321793e9130dc2cc77d4e7f670d2ce93d
2012-05-10 18:11:04 +09:00
Jean Chalard
eb995c7939 Merge "Fix a bug with a duplicate entry" into jb-dev 2012-05-10 00:29:21 -07:00
Jean Chalard
cfed94a656 Merge "Implement the delete button for user words" into jb-dev 2012-05-10 00:28:15 -07:00
Russell Brenner
7ff82ad4e0 Merge "Include Add Network button for Setup Wizard" into jb-dev 2012-05-09 22:53:59 -07:00
Russell Brenner
33806e72b0 Merge "Change title to "Wi-Fi network"" into jb-dev 2012-05-09 22:48:38 -07:00
Russell Brenner
44a49ed67e Include Add Network button for Setup Wizard
To allow first-time users to set up on networks with hidden SSID,
include this button on the action bar. Temporarily using
placeholder text until artwork is available.

Bug: 6446220
Change-Id: I437ad3f37b42b93f7a0c6838cbb0c5090073e32d
2012-05-09 22:34:39 -07:00
Jean Chalard
f14002ca6b Fix a bug with a duplicate entry
When going to the "all languages" dictionary and opening an
entry, the "all languages" entry would be listed twice.

Change-Id: Ie8cd7e9e824e95c05899b956905af6590b8929bc
2012-05-10 13:28:27 +09:00
Jean Chalard
5bdde7f939 Implement the delete button for user words
Bug: 6026080
Change-Id: I43345874edb0a1b51dfcac9c99e74c345eeef7e6
2012-05-10 13:22:21 +09:00
Russell Brenner
e57d992528 Change title to "Wi-Fi network"
Bug: 6471984
Change-Id: I1b4a1b838f1751bf128978a17e1e01618cd3a26d
2012-05-09 18:15:20 -07:00
Dianne Hackborn
622fc7aa5f Remove auto-brightness adjustment setting.
Not yet ready for release.

Change-Id: I4668e890080d63a29aeeeab4daad6a6466ae36af
2012-05-09 16:59:26 -07:00
Eric Fischer
d7eb103251 Merge "Import translations. DO NOT MERGE" 2012-05-09 16:51:14 -07:00