Hung-ying Tyan
ff393bf90b
Remove SingleServerProfile import.
2009-06-15 19:37:38 +08:00
Hung-ying Tyan
6d46267936
am 84cfb0dc
: Remove use of SingleServerProfile.
...
Merge commit '84cfb0dc9b87534d89651bc45128fc21c9d24423'
* commit '84cfb0dc9b87534d89651bc45128fc21c9d24423':
Remove use of SingleServerProfile.
2009-06-15 00:17:36 -07:00
Hung-ying Tyan
84cfb0dc9b
Remove use of SingleServerProfile.
...
* changes
+ mv SingleServerEditor.java VpnProfileEditor.java
+ Add loadExtraPreferecesTo() to VpnProfileEditor
+ Make L2tpIpsecEditor extend VpnProfileEditor and use loadExtraPreferencesTo()
+ Modify VpnEditor.getEditor() accordingly
2009-06-15 12:58:58 +08:00
Hung-ying Tyan
4d863f471b
am a55ae92a
: Remove isCustomized() check as the API is not used for now.
...
Merge commit 'a55ae92a132325e9307f291c455b1148d0bff3cf'
* commit 'a55ae92a132325e9307f291c455b1148d0bff3cf':
Remove isCustomized() check as the API is not used for now.
Remove LAUNCHER category from VPN settings activity's intent filter.
Improve power control widget GUI.
Minor UI improvements and showing of unplugged duration.
Make the Settings side of the date format settings more locale-aware.
2009-06-14 21:12:57 -07:00
Hung-ying Tyan
a55ae92a13
Remove isCustomized() check as the API is not used for now.
2009-06-15 11:17:30 +08:00
Hung-ying Tyan
71e2d3bc3a
Remove LAUNCHER category from VPN settings activity's intent filter.
...
Also add preference summary to the VPN entry in the security settings.
2009-06-14 17:53:19 +08:00
Eric Fischer
85f4357a4d
Make the SD Card settings use the system file size formatter.
...
The one built into the settings class wasn't internationalized.
2009-06-12 18:10:25 -07:00
Ken Shirriff
b315980367
Improve power control widget GUI.
...
Shrink power widget to 3 cells wide. Reorder buttons to group wireless
and other. Add color bar to indicate on/off.
2009-06-12 15:04:25 -07:00
Amith Yamasani
0422a3bf61
Minor UI improvements and showing of unplugged duration.
2009-06-12 14:23:15 -07:00
Eric Fischer
188ca77870
Make the Settings side of the date format settings more locale-aware.
...
Remove the two formats that have a spelled-out month, since applications
using this setting are trying to format numeric dates.
Do not forcibly set the setting the first time you go into Date & Time --
let the setting remain null if it was null before.
Add a choice corresponding to null to the list of format options. It will
look like "Normal (12-31-2009)" in the list, and will cause the system
to use whatever numeric format the locale calls for.
For the other choices, feed them to the locale-aware formatter so they
will appear with the punctuation that the locale calls for.
2009-06-12 13:23:07 -07:00
Hung-ying Tyan
339083fd46
am 1617706d
: Add VPN settings classes to Settings app.
...
Merge commit '1617706d2529b2182d1a7fe2348495fb8f40bb81'
* commit '1617706d2529b2182d1a7fe2348495fb8f40bb81':
Add VPN settings classes to Settings app.
2009-06-12 08:26:23 -07:00
Android (Google) Code Review
4849803725
am 1d097597
: Merge change 3994 into donut
...
Merge commit '1d09759798f029d684a636683ab7bf185eda9e6f'
* commit '1d09759798f029d684a636683ab7bf185eda9e6f':
Shrink power widget to 3 cells wide.
2009-06-12 08:26:22 -07:00
Android (Google) Code Review
12e2967e40
am a1ff25c9
: Merge change 3973 into donut
...
Merge commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0'
* commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0':
Removing the summary texts for the Accessibility checkbox
2009-06-12 08:25:55 -07:00
Chung-yih Wang
1bac55d785
am 150d5d84
: Use the keystore service instead of the direct file access.
...
Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4'
* commit '150d5d84e8913e93402950a84ff991b7549b71b4':
Use the keystore service instead of the direct file access.
2009-06-12 08:25:48 -07:00
Hung-ying Tyan
1617706d25
Add VPN settings classes to Settings app.
...
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
2009-06-12 15:44:49 +08:00
Android (Google) Code Review
1d09759798
Merge change 3994 into donut
...
* changes:
Shrink power widget to 3 cells wide.
2009-06-11 20:23:33 -07:00
Android (Google) Code Review
a1ff25c973
Merge change 3973 into donut
...
* changes:
Removing the summary texts for the Accessibility checkbox as requested by Raman.
2009-06-11 18:07:51 -07:00
Chung-yih Wang
150d5d84e8
Use the keystore service instead of the direct file access.
...
Revert back to my merged change 3710.
2009-06-12 08:16:26 +08:00
Ken Shirriff
0d3e37c22a
Shrink power widget to 3 cells wide.
2009-06-11 17:04:57 -07:00
Charles Chen
52b221d94b
Removing the summary texts for the Accessibility checkbox
...
as requested by Raman.
2009-06-11 15:54:36 -07:00
Android (Google) Code Review
781c1e4c7f
am ed36b1ab
: Merge change 3814 into donut
...
Merge commit 'ed36b1abc1a9bcb0e6b35233a7696b7df89408ea'
* commit 'ed36b1abc1a9bcb0e6b35233a7696b7df89408ea':
Fix power widget bluetooth.
2009-06-11 11:41:46 -07:00
Android (Google) Code Review
ed36b1abc1
Merge change 3814 into donut
...
* changes:
Fix power widget bluetooth.
2009-06-11 10:20:10 -07:00
Chung-yih Wang
24b17de66c
am e7e587da
: Revert "Use the keystore service instead of the direct file acess."
...
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'
* commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
Revert "Use the keystore service instead of the direct file acess."
2009-06-11 07:57:48 -07:00
Chung-yih Wang
17f69c88f5
am e97bfa3c
: Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
...
Merge commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884'
* commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884':
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
2009-06-11 07:57:39 -07:00
Chung-yih Wang
a0f6d64dbc
am 289705f3
: Use the keystore service instead of the direct file acess.
...
Merge commit '289705f3311932a45adef1710358f5e302115013'
* commit '289705f3311932a45adef1710358f5e302115013':
Use the keystore service instead of the direct file acess.
2009-06-11 07:57:34 -07:00
Chung-yih Wang
e7e587daf6
Revert "Use the keystore service instead of the direct file acess."
...
This reverts commit 289705f331
.
2009-06-11 18:13:49 +08:00
Chung-yih Wang
e97bfa3c25
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
2009-06-11 17:56:04 +08:00
Chung-yih Wang
289705f331
Use the keystore service instead of the direct file acess.
...
-- removed the temporal Keystore.java.
-- added the empty passphrase for private key.
2009-06-11 17:25:49 +08:00
Amith Yamasani
cc11cb8b03
am 5b578b4e
: SD card notification settings summary change for #1692416
...
Merge commit '5b578b4e3f7e45c0d2d5f17516cd9966a6e6359b'
* commit '5b578b4e3f7e45c0d2d5f17516cd9966a6e6359b':
SD card notification settings summary change for #1692416
2009-06-11 00:56:31 -07:00
The Android Open Source Project
aa86c45aa6
merged f9bbc3189f
w/ one minor conflict
2009-06-11 00:53:31 -07:00
Amith Yamasani
486044760a
am 78fd96a1
: More details in the summary and details screens.
...
Merge commit '78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6'
* commit '78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6':
More details in the summary and details screens.
2009-06-11 00:45:31 -07:00
Jean-Michel Trivi
685bc649fd
am 80368622
: Adding support for selecting the default language for Text-To-Speech in Settings.
...
Merge commit '8036862226b6cdb6903c2591e66b4b9328b1d484'
* commit '8036862226b6cdb6903c2591e66b4b9328b1d484':
Adding support for selecting the default language for Text-To-Speech in Settings.
2009-06-11 00:44:55 -07:00
Amith Yamasani
5b578b4e3f
SD card notification settings summary change for #1692416
2009-06-10 21:26:08 -07:00
Android (Google) Code Review
f9bbc3189f
Merge change 3494 into donut
...
* changes:
Use Phone.[get|set]SmscAddress() instead of OEMHookRaw.
2009-06-10 20:34:09 -07:00
Amith Yamasani
78fd96a1c5
More details in the summary and details screens.
...
Show packages included, time that a subsystem was on for.
Load label and icon in the background and cache the values.
Switch between totals and since-unplugged.
Other UI improvements.
2009-06-10 20:19:42 -07:00
Jean-Michel Trivi
8036862226
Adding support for selecting the default language for Text-To-Speech in Settings.
2009-06-10 17:12:41 -07:00
Android (Google) Code Review
624384657e
am a8d20626
: Merge change 3793 into donut
...
Merge commit 'a8d206265ba8bd9be41cf2dd222965688fdefb64'
* commit 'a8d206265ba8bd9be41cf2dd222965688fdefb64':
Update Portuguese translations.
2009-06-10 16:31:38 -07:00
Ken Shirriff
17f37f788a
Fix power widget bluetooth.
...
Starting wifi would also start bluetooth, due to a stray line.
bug=1910079
2009-06-10 16:27:19 -07:00
Android (Google) Code Review
8280446fcc
am b8c5a592
: Merge change 3689 into donut
...
Merge commit 'b8c5a592e738d6a7d45dec4dcc7fd74ff8577df9'
* commit 'b8c5a592e738d6a7d45dec4dcc7fd74ff8577df9':
CompatibilityMode settings
2009-06-10 15:33:46 -07:00
Eric Fischer
13157235ce
am 8477860c
: am 9e852f03
: AI 149721: Import Portuguese translations.
...
Merge commit '8477860c7c6b82c863e244f4c70b0ec945c4e70d'
* commit '8477860c7c6b82c863e244f4c70b0ec945c4e70d':
AI 149721: Import Portuguese translations.
2009-06-10 15:32:42 -07:00
Android (Google) Code Review
a8d206265b
Merge change 3793 into donut
...
* changes:
Update Portuguese translations.
2009-06-10 15:31:18 -07:00
Android (Google) Code Review
b8c5a592e7
Merge change 3689 into donut
...
* changes:
CompatibilityMode settings
2009-06-10 15:25:21 -07:00
Eric Fischer
c5b818020d
Update Portuguese translations.
2009-06-10 15:12:18 -07:00
Jean-Michel Trivi
ef0bed33b9
CompatibilityMode settings
2009-06-10 13:57:27 -07:00
Eric Fischer
8477860c7c
am 9e852f03
: AI 149721: Import Portuguese translations.
...
Merge commit '9e852f03139b28c1f5ad2bc43c64bdf0adae9226' into donut
* commit '9e852f03139b28c1f5ad2bc43c64bdf0adae9226':
AI 149721: Import Portuguese translations.
2009-06-10 12:31:43 -07:00
Eric Fischer
9e852f0313
AI 149721: Import Portuguese translations.
...
Automated import of CL 149721
2009-06-10 12:26:09 -07:00
Android (Google) Code Review
de2ef7404d
Merge change 1182
...
* changes:
Settings app changes for Bluez4.
2009-06-09 21:54:22 -07:00
Jean-Michel Trivi
1782fdee31
am ed29a658
: Adding Text-To-Speech default settings in the Settings application.
...
Merge commit 'ed29a6583578a094350596246cb43c2876fd93b4'
* commit 'ed29a6583578a094350596246cb43c2876fd93b4':
Adding Text-To-Speech default settings in the Settings application.
2009-06-09 14:09:17 -07:00
Jean-Michel Trivi
ed29a65835
Adding Text-To-Speech default settings in the Settings application.
2009-06-09 10:48:22 -07:00
Chung-yih Wang
380db9021c
am 0c1f8985
: Add EAP/802.1X configuration for WiFi Setting.
...
Merge commit '0c1f89857a730f9f75312fce39ff65c2f01e7d22'
* commit '0c1f89857a730f9f75312fce39ff65c2f01e7d22':
Add EAP/802.1X configuration for WiFi Setting.
2009-06-08 19:17:02 -07:00