Commit Graph

100798 Commits

Author SHA1 Message Date
Android (Google) Code Review
6b0cdd4e1f am 879f7bcf: Merge change 6272 into donut
Merge commit '879f7bcf41782940fff3ffcb3586d606361360c6'

* commit '879f7bcf41782940fff3ffcb3586d606361360c6':
  Fix bug 1946195 by making use of the current Locale to set a default value
2009-07-06 17:05:23 -07:00
Android (Google) Code Review
879f7bcf41 Merge change 6272 into donut
* changes:
  Fix bug 1946195 by making use of the current Locale to set a default value in the language pref list (bug was no selection in the default language list). Fix half of bug 1956707 where speech rate value as read from the settings was translated to a ratio, which applied an improper speech rate on the TTS engine (bug was setting a default rate makes the TTS demo unintelligible). Moved logic to set the default value in the language pref list in a separate private method to improve readability. Changed default rate values so that normal is 1x and the fastest is 2x.
2009-07-06 17:03:03 -07:00
Jean-Michel Trivi
44fbbea071 Fix bug 1946195 by making use of the current Locale to set a default value
in the language pref list (bug was no selection in the default language list).
Fix half of bug 1956707 where speech rate value as read from the settings
was translated to a ratio, which applied an improper speech rate on the
TTS engine (bug was setting a default rate makes the TTS demo unintelligible).
Moved logic to set the default value in the language pref list in a separate
private method to improve readability.
Changed default rate values so that normal is 1x and the fastest is 2x.
2009-07-06 14:16:17 -07:00
Hung-ying Tyan
7888cc450a am 0a59b500: Integrate VPN with new keystore and misc fixes.
Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'

* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
  Integrate VPN with new keystore and misc fixes.
2009-07-06 11:22:33 -07:00
Chung-yih Wang
bd7f05701a am eb7836f1: Apply the new keystore and certtool library in Wifi setting.
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'

* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
  Apply the new keystore and certtool library in Wifi setting.
2009-07-06 11:22:32 -07:00
Hung-ying Tyan
acedb4b501 am 4e45d392: Add certificate to keystore for the ADD intent
Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'

* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
  Add certificate to keystore for the ADD intent
2009-07-06 11:22:15 -07:00
Hung-ying Tyan
90091ad69b am d40b9c5d: Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL
Merge commit 'd40b9c5dff4b8866f188ba8166cba4fb657fafb2'

* commit 'd40b9c5dff4b8866f188ba8166cba4fb657fafb2':
  Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL
2009-07-06 11:22:14 -07:00
Hung-ying Tyan
bb0c941b30 am 6a0544be: Fix strings.
Merge commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f'

* commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f':
  Fix strings.
2009-07-06 11:22:04 -07:00
Hung-ying Tyan
902a297d92 am 7031ab0d: Add credential storage settings.
Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1'

* commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1':
  Add credential storage settings.
2009-07-06 11:21:57 -07:00
Hung-ying Tyan
0a59b50014 Integrate VPN with new keystore and misc fixes.
* Changes
  + Pass intent to keystore when needed and hooks to resume from it.
  + Generate random, unique ID for profile instead of base64 from its
    name.
  + Add VPN to "Wirless controls" description.
  + Add credential storage to "Security & location" description.
  + More hints to set password and unlock dialogs in credential storage
    settings for actions that come from other processes.
  + Sort VPN profiles according to the names.
  + Replace Keystore with CertTool in L2tpIpsecEditor
2009-07-06 18:47:47 +08:00
Chung-yih Wang
eb7836f11e Apply the new keystore and certtool library in Wifi setting.
1. Certificate related APIs were moved to CertTool. Therefore,
   we have to migrate to CertTool instead.
2. Unlock the keystore if it is not unlocked yet(send the intent
   out to credential storage) for EAP access points.
3. Add Password field for WPA_EAP and IEEE8021X(this is for
   phase 2 auth.)
2009-07-06 17:03:53 +08:00
Hung-ying Tyan
4e45d392ad Add certificate to keystore for the ADD intent 2009-07-05 10:37:55 +08:00
Hung-ying Tyan
d40b9c5dff Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL
Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL intents to manifest.
2009-07-04 10:16:07 +08:00
Hung-ying Tyan
6a0544be5c Fix strings.
* Changes
  + "Disconnect from network"
  + "Remember username"
  + "Unable to connect to the network"
2009-07-04 00:39:58 +08:00
Michael Chan
f9bdcb6c26 am 132b2144: Disable the individual remote Bluetooth devices when BT is off
Merge commit '132b21440b1b930322fc129a504afa6107835f8e'

* commit '132b21440b1b930322fc129a504afa6107835f8e':
  Disable the individual remote Bluetooth devices when BT is off
2009-07-03 08:17:50 -07:00
Hung-ying Tyan
7031ab0d75 Add credential storage settings.
* Changes
  + Initial implementation of credential storage settings.
  + Use alert icon on delete and reconnect dialogs in VpnSettings.
    (piggy-backed)
  Patch Set 12:
  + Add password length and no-space verification.
  + Simplify dialog view xml files.
2009-07-03 23:00:53 +08:00
Hung-ying Tyan
dcd9886b4e am e5b9e4bd: Add L2tpIpsecPskEditor.
Merge commit 'e5b9e4bddf1aed4f647da3966d831a165a064f80'

* commit 'e5b9e4bddf1aed4f647da3966d831a165a064f80':
  Add L2tpIpsecPskEditor.
2009-07-02 14:25:19 -07:00
Jean-Michel Trivi
5070b88af4 am 88ec7ebf: Fix bug 1943785 where the default country string could be accessed while still being null. This was due to Settings.Secure.getString() returning null when a property isn\'t found, instead of a string with the value "null".
Merge commit '88ec7ebfe935c0541df3289c31574adbc01bd8bb'

* commit '88ec7ebfe935c0541df3289c31574adbc01bd8bb':
  Fix bug 1943785 where the default country string could be accessed while
2009-07-01 22:44:24 -07:00
Michael Chan
132b21440b Disable the individual remote Bluetooth devices when BT is off 2009-07-01 14:06:43 -07:00
Ken Shirriff
22ce76eee0 am 311356dd: Redo power widget layout with the proper widget style.
Merge commit '311356dd71eb33a383fb9a5b470517103ea1f424'

* commit '311356dd71eb33a383fb9a5b470517103ea1f424':
  Redo power widget layout with the proper widget style.
2009-07-01 11:18:38 -07:00
Hung-ying Tyan
e5b9e4bddf Add L2tpIpsecPskEditor.
* Changes
  + Add L2tpIpsecPskEditor.java.
  + Save profile name in VpnEditor to be used in saveSecrets().
2009-07-01 11:06:45 +08:00
Jean-Michel Trivi
88ec7ebfe9 Fix bug 1943785 where the default country string could be accessed while
still being null. This was due to Settings.Secure.getString() returning
null when a property isn't found, instead of a string with the value "null".
2009-06-30 15:14:30 -07:00
Dianne Hackborn
8cb8433fad am 116d85ea: Clean up some of the intent filters in the manifest.
Merge commit '116d85eaa7e6a97e5fa0c3c01cb16822a3b6519c'

* commit '116d85eaa7e6a97e5fa0c3c01cb16822a3b6519c':
  Clean up some of the intent filters in the manifest.
2009-06-29 20:20:07 -07:00
Ken Shirriff
311356dd71 Redo power widget layout with the proper widget style.
The power widget now uses the fuzzy-edged widget background.
It has a resonable layout in portrait and landscape.
appwidget_inner is the background for a button on the inside, with a border on the left.
appwidget_outer is the background for a button on the outside (i.e. leftmost); it
does not have a border.
2009-06-29 16:43:23 -07:00
Dianne Hackborn
116d85eaa7 Clean up some of the intent filters in the manifest. 2009-06-26 18:20:23 -07:00
Hung-ying Tyan
776be77313 am e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156'

* commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156':
  Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
2009-06-26 01:07:01 -07:00
Hung-ying Tyan
e7565f3c48 Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
* Changes
  + Add L2tpActor, L2tpEditor, L2tpIpsecPskActor.
  + Make L2tpIpsecEditor extend L2tpEditor.
  + Revise the code for saving username. Make
    VpnSettings.saveProfileToStorage() static.
  + Fix support for screen orientation change in both VpnSettings and
    VpnEditor.

  Patch Set 2:
  + Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead.
  + Remove unused imports. Wrap lines longer than 80 chars.

  Patch Set 3:
  + Fix all the strings according to UI feedback.
  + Remove all the added actor subclasses and move password to editor.
  + Remove VPN entry in Security & location.

  Patch Set 4:
  + Misc string fixes.

  Patch Set 5:
  + Add strings for credential storage settings.
  + Changed the error dialog icon.
  + Fix "Remember me" indentation in connect dialog.

  Patch Set 6:
  + resolve res/values/strings.xml
2009-06-26 14:24:50 +08:00
Chouting Zhang
620965ccc5 am 386278a3: CDMA Settings additions
Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
  CDMA Settings additions
2009-06-25 22:06:36 -07:00
Chouting Zhang
386278a338 CDMA Settings additions
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
2009-06-25 22:01:32 -07:00
Roy West
65e761f144 am d2e3b013: Edit second line of Search settings. First part of fix to bug1928620.
Merge commit 'd2e3b0139009b98be5ed825e58c38a325240594e'

* commit 'd2e3b0139009b98be5ed825e58c38a325240594e':
  Edit second line of Search settings. First part of fix to bug1928620.
2009-06-25 16:50:42 -07:00
Mike Lockwood
d75fb2f92f Settings: Add preference to enable/disable assisted GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-25 17:16:10 -04:00
Roy West
d2e3b01390 Edit second line of Search settings. First part of fix to bug1928620. 2009-06-25 13:40:28 -07:00
Android (Google) Code Review
a4e9f21075 am 02062f44: Merge change 5391 into donut
Merge commit '02062f44ff929cf635d0523f9f93ffa69d182899'

* commit '02062f44ff929cf635d0523f9f93ffa69d182899':
  Fix an NPE.
2009-06-25 12:40:38 -07:00
Android (Google) Code Review
02062f44ff Merge change 5391 into donut
* changes:
  Fix an NPE.
2009-06-25 12:38:11 -07:00
Amith Yamasani
1fd2958ad4 Fix an NPE.
Sometimes name is null, compare the other way around.
2009-06-25 12:27:21 -07:00
Android (Google) Code Review
49d2e2d695 am 517ce789: Merge change 5374 into donut
Merge commit '517ce789b4c624c6e15b9f6ca2f5757396315247'

* commit '517ce789b4c624c6e15b9f6ca2f5757396315247':
  Remove pitch selection from TTS settings.
2009-06-25 12:20:03 -07:00
Android (Google) Code Review
517ce789b4 Merge change 5374 into donut
* changes:
  Remove pitch selection from TTS settings. Use the settings name for the locale property rather than the UI key. Add prefs entry to install the voice data.
2009-06-25 12:18:54 -07:00
Mike Lockwood
348f1f6470 am b7e46e89: Display a warning dialog when the user enables USB debugging.
Merge commit 'b7e46e89d77574dbb51855144ea3d46fcf220bbb'

* commit 'b7e46e89d77574dbb51855144ea3d46fcf220bbb':
  Display a warning dialog when the user enables USB debugging.
2009-06-25 10:51:06 -07:00
Mike Lockwood
b7e46e89d7 Display a warning dialog when the user enables USB debugging.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-25 13:36:00 -04:00
Jean-Michel Trivi
2acc02e942 Remove pitch selection from TTS settings.
Use the settings name for the locale property rather than the UI key.
Add prefs entry to install the voice data.
2009-06-25 10:03:43 -07:00
Amith Yamasani
c45985f4d8 am 0f1e11e2: Track native processes.
Merge commit '0f1e11e219c9e89bb4a939cd864eb03087e784be'

* commit '0f1e11e219c9e89bb4a939cd864eb03087e784be':
  Track native processes.
2009-06-25 00:49:06 -07:00
Amith Yamasani
0f1e11e219 Track native processes.
Add gauge to detail screen and make it look like the item from summary screen.
Some string changes.
2009-06-25 00:40:50 -07:00
Dianne Hackborn
db4e90d3b3 am a54672f3: Some cleanup of settings launching, adding shortcuts.
Merge commit 'a54672f3a983766cf1dce754b3887807fcb723fa'

* commit 'a54672f3a983766cf1dce754b3887807fcb723fa':
  Some cleanup of settings launching, adding shortcuts.
2009-06-24 20:37:05 -07:00
Dianne Hackborn
a54672f3a9 Some cleanup of settings launching, adding shortcuts.
- Move the battery usage item from applications to phone info.
- Give the battery usage item a summary.
- Fiddle with the manifest to make it so we can launch parts of the settings
  app without messing up launching of the main app.  (That is, remove
  affinities so they each are treated as different tasks.)
- Add the ability to make shortcuts to some key settings panels.
2009-06-24 20:13:16 -07:00
Roy West
b0d48f630b am 74b53da2: Additional edits to strings when uninstalling system app updates.
Merge commit '74b53da2532e3c611f712d80a50445ae5c7863a0'

* commit '74b53da2532e3c611f712d80a50445ae5c7863a0':
  Additional edits to strings when uninstalling system app updates.
2009-06-24 15:44:34 -07:00
Amith Yamasani
1f2f8a9afb am 972fc298: Description and suggestion strings for Battery Usage detail screens.
Merge commit '972fc2989aba6757e5128aaf8d800fed04f8400f'

* commit '972fc2989aba6757e5128aaf8d800fed04f8400f':
  Description and suggestion strings for Battery Usage detail screens.
2009-06-24 15:44:33 -07:00
Roy West
74b53da253 Additional edits to strings when uninstalling system app updates.
Fixes bug 1940257.
2009-06-24 09:25:12 -07:00
Amith Yamasani
bef619fbe0 Description and suggestion strings for Battery Usage detail screens. 2009-06-23 21:39:26 -07:00
Amith Yamasani
972fc2989a Description and suggestion strings for Battery Usage detail screens. 2009-06-23 17:43:22 -07:00
Roy West
98e474805e am 4b007cb7: Fix bug 1937431.
Merge commit '4b007cb7323b41d66ddce7ec26573bce9e79cda0'

* commit '4b007cb7323b41d66ddce7ec26573bce9e79cda0':
  Fix bug 1937431.
2009-06-23 17:16:07 -07:00