PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,623 Commits 1 Branch 0 Tags
acee16f5ce4b9763a2f9f1fac22f6d252b51f9f6
Commit Graph

7623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
35e59cbed9 am cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev 
* commit 'cefc41fd9705d3d3c5cbc47d1dd854a618bcf313':
  Update references to PowerManager constants that have moved.
 2012-05-11 19:35:21 -07:00
Jeff Brown
cefc41fd97 Merge "Update references to PowerManager constants that have moved." into jb-dev 2012-05-11 19:33:09 -07:00
Jeff Brown
defcb0060d Update references to PowerManager constants that have moved. 
Bug: 6435382
Change-Id: Ieea857644dc0cf758e0ff4fd595c6a0115457df0
 2012-05-11 18:40:27 -07:00
Kenny Root
a1b0f80712 am 72a84b78: Merge "WiFi: only send engine setting when key_id is set" into jb-dev 
* commit '72a84b78d08d41d6e76767744d03d928e0aa26e1':
  WiFi: only send engine setting when key_id is set
 2012-05-11 15:52:08 -07:00
Kenny Root
72a84b78d0 Merge "WiFi: only send engine setting when key_id is set" into jb-dev 2012-05-11 15:49:31 -07:00
Eric Fischer
abe390746e am 411e7724: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '411e7724c67a19d257b19c3a349ac7c3cf0eae3a':
  Import translations. DO NOT MERGE
 2012-05-11 15:38:39 -07:00
Eric Fischer
411e7724c6 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-11 15:37:09 -07:00
Eric Fischer
a1681c8b0b Import translations. DO NOT MERGE 
Change-Id: I7c0b23cef5261ac308c5657f3230a320ea7f95ec
 2012-05-11 15:12:42 -07:00
Eric Fischer
948a83eef9 Import translations. DO NOT MERGE 
Change-Id: I94d8cef2d5740b708313cc1f94b169824a3ea06e
 2012-05-11 15:10:41 -07:00
Amith Yamasani
55fd6a2b30 am 233aa98b: Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev 
* commit '233aa98b05fbbd908f57fce8157f2f828253ce50':
  Add a tablet-specific string to describe NFC checkbox.
 2012-05-11 12:54:52 -07:00
Amith Yamasani
233aa98b05 Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev 2012-05-11 12:52:52 -07:00
Kenny Root
4591cf8840 am 6a665664: Strip off phase2 prefix when setting spinner 
* commit '6a6656641c58fd4396c011639dbc02a58636294f':
  Strip off phase2 prefix when setting spinner
 2012-05-11 12:41:46 -07:00
Kenny Root
6a6656641c Strip off phase2 prefix when setting spinner 
The writing and reading code for phase2 settings were asymmetric so the
phase2 spinner would always be set as "None". This change strips off the
prefix to set the spinner.

Bug: 6482316
Change-Id: Iaaa1088ec22625f1b8e3974c8a9610cccf0dda90
 2012-05-11 12:18:55 -07:00
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