PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,714 Commits 1 Branch 0 Tags
4a12cd51a68a13ce27c0b19938c645c6f4c40e6c
Commit Graph

81714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chung-yih Wang
210e7acf82 Transient patch for the WifiConfiguration change. 
Comment out the access to the enterprise fields of
WifiConfiguration class in AccessPointState class.
And will have a new patch for accessing the new WifiConfiguration.
 2009-09-14 14:25:09 +08:00
Hung-ying Tyan
7c20380ee1 am a3aaf19e: Fix setting passwd string and vpn checkbox titles. 
Merge commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d' into eclair-plus-aosp

* commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d':
  Fix setting passwd string and vpn checkbox titles.
 2009-09-13 23:08:01 -07:00
Jaikumar Ganesh
1b7ffcf495 am 5f23cb39: Modify settings for 2.1 
Merge commit '5f23cb39a1bd9c319383108c209fca7f0256894b' into eclair-plus-aosp

* commit '5f23cb39a1bd9c319383108c209fca7f0256894b':
  Modify settings for 2.1
 2009-09-13 23:07:55 -07:00
Hung-ying Tyan
a3aaf19e09 Fix setting passwd string and vpn checkbox titles. 
* Add min length requirement in setting passwd string.
* Do not change vpn checkbox title with state changes.
 2009-09-14 11:54:29 +08:00
Nick Pelly
f9dce06d5e am d6375e97: Merge change 24726 into eclair 
Merge commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp

* commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
  Update AndroidManifest.xml for new Intent locations.
 2009-09-11 12:01:07 -07:00
Jaikumar Ganesh
5f23cb39a1 Modify settings for 2.1 
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
 2009-09-11 12:00:14 -07:00
Android (Google) Code Review
d6375e975e Merge change 24726 into eclair 
* changes:
  Update AndroidManifest.xml for new Intent locations.
 2009-09-11 14:55:44 -04:00
Nick Pelly
5ddbd94df6 Update AndroidManifest.xml for new Intent locations. 
This will fix a regression since the recent BT API changes. The settings app
would have missed some Bluetooth events, especially pairing.

Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
 2009-09-11 11:41:59 -07:00
Xianzhu Wang
e8b40cb857 am 88651a0b: Regenerate timezones.xml after adding Asia/Shanghai timezone for mainland China, using cldr 1.7.1 and merging translations for "Beijing". 
Merge commit '88651a0b2a7a7038c8befb321100a64aec9933b8' into eclair-plus-aosp

* commit '88651a0b2a7a7038c8befb321100a64aec9933b8':
  Regenerate timezones.xml after adding Asia/Shanghai timezone for
 2009-09-11 10:34:42 -07:00
Xianzhu Wang
88651a0b2a Regenerate timezones.xml after adding Asia/Shanghai timezone for 
mainland China, using cldr 1.7.1 and merging translations for "Beijing".

Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".
 2009-09-11 14:41:05 +08:00
Nick Pelly
d6350bc918 am 3ca2df1c: am 16cc8631: Update application for Bluetooth API changes. 
Merge commit '3ca2df1ce5683fe9713290f7819b54cea3a2cdfa'

* commit '3ca2df1ce5683fe9713290f7819b54cea3a2cdfa':
  Update application for Bluetooth API changes.
 2009-09-10 19:06:37 -07:00
Nick Pelly
3ca2df1ce5 am 16cc8631: Update application for Bluetooth API changes. 
Merge commit '16cc86315d7a8e1f6a0f3083d0a810a7cb097832' into eclair-plus-aosp

* commit '16cc86315d7a8e1f6a0f3083d0a810a7cb097832':
  Update application for Bluetooth API changes.
 2009-09-10 19:01:20 -07:00
Nick Pelly
16cc86315d Update application for Bluetooth API changes. 
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
 2009-09-10 18:44:25 -07:00
Dianne Hackborn
14d8062dc7 am 21ee9c24: am cded8478: Merge change 24553 into eclair 
Merge commit '21ee9c240352b66f4f13a3fff80c7322e9745d7a'

* commit '21ee9c240352b66f4f13a3fff80c7322e9745d7a':
  Make running services show dependent processes.
 2009-09-10 13:11:21 -07:00
Dianne Hackborn
21ee9c2403 am cded8478: Merge change 24553 into eclair 
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp

* commit 'cded847838c726342bfe56e69d417d160c73f212':
  Make running services show dependent processes.
 2009-09-10 13:05:53 -07:00
Android (Google) Code Review
cded847838 Merge change 24553 into eclair 
* changes:
  Make running services show dependent processes.
 2009-09-10 15:57:57 -04:00
Marco Nelissen
7ae238f789 am 0da7d948: am e07eb497: Merge change 24555 into eclair 
Merge commit '0da7d948df0ef30dffe4ae27388ef5c648425ea6'

* commit '0da7d948df0ef30dffe4ae27388ef5c648425ea6':
  Allow setting a silent ringtone (bug 1600056).
 2009-09-10 12:42:06 -07:00
Marco Nelissen
0da7d948df am e07eb497: Merge change 24555 into eclair 
Merge commit 'e07eb49793ef2d4fd494717159ebdd3aaef41e08' into eclair-plus-aosp

* commit 'e07eb49793ef2d4fd494717159ebdd3aaef41e08':
  Allow setting a silent ringtone (bug 1600056).
 2009-09-10 12:38:23 -07:00
Android (Google) Code Review
e07eb49793 Merge change 24555 into eclair 
* changes:
  Allow setting a silent ringtone (bug 1600056).
 2009-09-10 15:33:55 -04:00
Marco Nelissen
0399617744 Allow setting a silent ringtone (bug 1600056). 2009-09-10 12:11:33 -07:00
Dianne Hackborn
85710167c6 Make running services show dependent processes. 
And other various improvement and cleanup.

Change-Id: I0a33ab2876c8f409cd3cfecbbac574563ef1a162
 2009-09-10 12:08:53 -07:00
Hung-ying Tyan
386d7a004f am 6cdd5e8b: am f71c8b40: Add install-cert-from-sdcard in Security settings 
Merge commit '6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66'

* commit '6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66':
  Add install-cert-from-sdcard in Security settings
 2009-09-10 09:23:24 -07:00
Hung-ying Tyan
6cdd5e8bc4 am f71c8b40: Add install-cert-from-sdcard in Security settings 
Merge commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb' into eclair-plus-aosp

* commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb':
  Add install-cert-from-sdcard in Security settings
 2009-09-10 02:06:34 -07:00
Hung-ying Tyan
f71c8b40b5 Add install-cert-from-sdcard in Security settings 
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
 2009-09-10 12:50:10 +08:00
Jean-Michel Trivi
2da4c0a6f6 am 23c24f87: am 18cd4093: Merge change 24440 into eclair 
Merge commit '23c24f87914da3cc798e2fb3b2b08898d89acb49'

* commit '23c24f87914da3cc798e2fb3b2b08898d89acb49':
  Fix bug 2078454 where clicking on Settings in the Home menu would
 2009-09-09 16:31:28 -07:00
Jaikumar Ganesh
5fb6c592de am c9311040: am 6ee7dd09: Merge change 24435 into eclair 
Merge commit 'c93110409c05bef4be5428ef36099a586828cbb2'

* commit 'c93110409c05bef4be5428ef36099a586828cbb2':
  Fix display strings and enter passkey handling.
 2009-09-09 16:31:11 -07:00
Nick Pelly
bbcf1a7812 am 8a6730df: am 843b4ee1: Merge change 24276 into eclair 
Merge commit '8a6730df320b2fa10ac11ea1aad06d85bbed31e4'

* commit '8a6730df320b2fa10ac11ea1aad06d85bbed31e4':
  Update application for Bluetooth API change: deprecation of BluetoothError.
 2009-09-09 16:28:37 -07:00
Nick Pelly
e8058e18ac am 3b83477f: am 1e451997: Merge change 24230 into eclair 
Merge commit '3b83477fe391ea6b9eb6ff783283a3f3002e8e7a'

* commit '3b83477fe391ea6b9eb6ff783283a3f3002e8e7a':
  Update application for Bluetooth API change.
 2009-09-09 16:28:20 -07:00
Marco Nelissen
cc233b22b5 am 8080d6a2: am 620e5f9c: Remove logging. 
Merge commit '8080d6a2ceb10b1050fd5663ef0950be55ee8802'

* commit '8080d6a2ceb10b1050fd5663ef0950be55ee8802':
  Remove logging.
 2009-09-09 16:27:55 -07:00
Jean-Michel Trivi
23c24f8791 am 18cd4093: Merge change 24440 into eclair 
Merge commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f' into eclair-plus-aosp

* commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f':
  Fix bug 2078454 where clicking on Settings in the Home menu would
 2009-09-09 15:42:27 -07:00
Android (Google) Code Review
18cd409301 Merge change 24440 into eclair 
* changes:
  Fix bug 2078454 where clicking on Settings in the Home menu would take the user to Market after clicking on "Install Voice Data" in the TTS Settings page. Launching the Activity for the installation of the TTS data should be a distinct task, dissociated from the one associated with the Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return a result, so the activity should be started with startActivity() rather than startActivityForResult().
 2009-09-09 18:38:11 -04:00
Jean-Michel Trivi
58ea43acf9 Fix bug 2078454 where clicking on Settings in the Home menu would 
take the user to Market after clicking on "Install Voice Data" in
the TTS Settings page.
Launching the Activity for the installation of the TTS data should
be a distinct task, dissociated from the one associated with the
Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return
a result, so the activity should be started with startActivity()
rather than startActivityForResult().
 2009-09-09 15:20:56 -07:00
Jaikumar Ganesh
c93110409c am 6ee7dd09: Merge change 24435 into eclair 
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp

* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
  Fix display strings and enter passkey handling.
 2009-09-09 15:14:00 -07:00
Android (Google) Code Review
6ee7dd0913 Merge change 24435 into eclair 
* changes:
  Fix display strings and enter passkey handling.
 2009-09-09 18:06:30 -04:00
Jaikumar Ganesh
67efa271bb Fix display strings and enter passkey handling. 2009-09-09 15:03:24 -07:00
Nick Pelly
8a6730df32 am 843b4ee1: Merge change 24276 into eclair 
Merge commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d' into eclair-plus-aosp

* commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d':
  Update application for Bluetooth API change: deprecation of BluetoothError.
 2009-09-09 11:39:11 -07:00
Android (Google) Code Review
843b4ee178 Merge change 24276 into eclair 
* changes:
  Update application for Bluetooth API change: deprecation of BluetoothError.
 2009-09-09 14:34:52 -04:00
Nick Pelly
3b83477fe3 am 1e451997: Merge change 24230 into eclair 
Merge commit '1e4519979b32957698a6825eb6eb61bd85dd7370' into eclair-plus-aosp

* commit '1e4519979b32957698a6825eb6eb61bd85dd7370':
  Update application for Bluetooth API change.
 2009-09-09 11:34:26 -07:00
Android (Google) Code Review
1e4519979b Merge change 24230 into eclair 
* changes:
  Update application for Bluetooth API change.
 2009-09-09 14:30:26 -04:00
Marco Nelissen
8080d6a2ce am 620e5f9c: Remove logging. 
Merge commit '620e5f9c05a3ef5d29d8bf6a220882c3ff32fb4e' into eclair-plus-aosp

* commit '620e5f9c05a3ef5d29d8bf6a220882c3ff32fb4e':
  Remove logging.
 2009-09-09 10:59:53 -07:00
Eric Fischer
721a646013 am 76872f5a: (-s ours) am 140fb90a: Import revised translations. DO NOT MERGE 
Merge commit '76872f5a12e3f697a90c08bc717918fa7469d265'

* commit '76872f5a12e3f697a90c08bc717918fa7469d265':
  Import revised translations.  DO NOT MERGE
 2009-09-09 10:58:07 -07:00
Marco Nelissen
620e5f9c05 Remove logging. 2009-09-09 09:06:40 -07:00
Nick Pelly
f4779354b3 Update application for Bluetooth API change: deprecation of BluetoothError. 2009-09-08 17:49:57 -07:00
Eric Fischer
76872f5a12 am 140fb90a: Import revised translations. DO NOT MERGE 
Merge commit '140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp

* commit '140fb90a5cfc6e146e006350edfb41a9978ad105':
  Import revised translations.  DO NOT MERGE
 2009-09-08 17:09:19 -07:00
Eric Fischer
140fb90a5c Import revised translations. DO NOT MERGE 2009-09-08 16:55:50 -07:00
Nick Pelly
ca564d6bda Update application for Bluetooth API change. 2009-09-08 16:24:03 -07:00
Jean-Baptiste Queru
9966e02941 am 54fa2be7: merge from open-source master 
Merge commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4'

* commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4':
 2009-09-04 11:06:28 -07:00
Jean-Baptiste Queru
54fa2be765 merge from open-source master 2009-09-04 07:51:26 -07:00
Dianne Hackborn
b0c72700e0 am b7558f37: am 76315391: Improve running services to services managed by the system. 
Merge commit 'b7558f3700c6588e323975af2c24cd7f18ba007a'

* commit 'b7558f3700c6588e323975af2c24cd7f18ba007a':
  Improve running services to services managed by the system.
 2009-09-03 14:44:18 -07:00
Dianne Hackborn
b7558f3700 am 76315391: Improve running services to services managed by the system. 
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp

* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
  Improve running services to services managed by the system.
 2009-09-03 14:42:34 -07:00