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
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
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
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
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
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
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
Jean-Michel Trivi
ef0bed33b9
CompatibilityMode settings
2009-06-10 13:57:27 -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
Chung-yih Wang
0c1f89857a
Add EAP/802.1X configuration for WiFi Setting.
...
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.
-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
2009-06-09 10:11:11 +08:00
Jaikumar Ganesh
91b33f1462
Settings app changes for Bluez4.
2009-06-08 17:28:06 -07:00
Ken Shirriff
db08e6543a
am 03a6110b
: Implement the power-control widget.
...
Merge commit '03a6110b4f62e72592b451c05848cfaad8c65324'
* commit '03a6110b4f62e72592b451c05848cfaad8c65324':
Implement the power-control widget.
2009-06-08 15:36:39 -07:00
jsh
21dd407c10
Use Phone.[get|set]SmscAddress() instead of OEMHookRaw.
2009-06-08 14:58:10 -07:00
Ken Shirriff
03a6110b4f
Implement the power-control widget.
...
This widget allows uses to turn on/off bluetooth, wifi, gps, and sync,
and adjust brightness without going through the settings menu.
The widget provider updates the settings when the buttons are pressed.
The widget provider is also a receiver for events indicating that the
status was updated elsewhere and the buttons need to be changed.
2009-06-08 13:57:26 -07:00
Mike Lockwood
f39e714f24
am 5ed2c4ad
: Listen for changes to location pProvider enabled settings.
...
Merge commit '5ed2c4ad43f2c3c85a025da04becd2eaa75927a1'
* commit '5ed2c4ad43f2c3c85a025da04becd2eaa75927a1':
Listen for changes to location pProvider enabled settings.
2009-06-08 07:53:56 -07:00
Mike Lockwood
53f0e8a45b
am d1330867
: Remove Network Location" opt-in dialog from "Security and Settings"
...
Merge commit 'd13308674b4ff614b6ade32efde0d7cff6d8dc2a'
* commit 'd13308674b4ff614b6ade32efde0d7cff6d8dc2a':
Remove Network Location" opt-in dialog from "Security and Settings"
2009-06-08 07:53:52 -07:00
Mike Lockwood
5ed2c4ad43
Listen for changes to location pProvider enabled settings.
...
This is needed so we can correctly update the network location checkbox
if the network location provider is disabled because the user disagreed
to the terms of service in a dialog shown by the provider.
Signed-off-by: Mike Lockwood <lockwood@android.com >
2009-06-08 08:21:12 -04:00
Mike Lockwood
d13308674b
Remove Network Location" opt-in dialog from "Security and Settings"
...
This dialog is being moved to the Network Location Provider itself.
Signed-off-by: Mike Lockwood <lockwood@android.com >
2009-06-07 20:11:39 -04:00
Amith Yamasani
8f2da76e83
am 7f6aa628
: Add detail page for Battery usage and track GPS and foreground CPU.
...
Merge commit '7f6aa6283ae759c5b013c142be036617cf79f725'
* commit '7f6aa6283ae759c5b013c142be036617cf79f725':
Add detail page for Battery usage and track GPS and foreground CPU.
2009-06-03 16:57:28 -07:00
Amith Yamasani
7f6aa6283a
Add detail page for Battery usage and track GPS and foreground CPU.
...
Show details such as Cpu time, Cpu foreground time, data sent/received,
and GPS usage.
2009-06-03 16:31:15 -07:00
Wink Saville
402a740f64
am e2a14e35
: Update some TODO comments.
...
Merge commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03'
* commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03':
Update some TODO comments.
2009-06-01 14:27:01 -07:00
Wink Saville
e2a14e35aa
Update some TODO comments.
2009-05-29 14:06:30 -07:00
Amith Yamasani
3ef23c84d3
am 2a2daf96
: Top level screen for App Fuel Gauge.
...
Merge commit '2a2daf960c43a2c97b1c6da430138e08e9caa54f'
* commit '2a2daf960c43a2c97b1c6da430138e08e9caa54f':
Top level screen for App Fuel Gauge.
2009-05-23 23:01:31 -07:00
Amith Yamasani
2a2daf960c
Top level screen for App Fuel Gauge.
...
Shows sorted list of power usage (with some debug information) by the top 10
apps and subsystems. Doesn't yet take into account certain subsystems such
as data network usage, audio/video DSP usage, Bluetooth and lights other than
screen backlight.
Screen, Idle, Wifi and Voice usage and CPU time are accounted for.
Also need to add detail screens for each item and suggested actions.
2009-05-22 19:41:32 -07:00
Robert Greenwalt
1150f5e8e6
Update hidden API with a persist option.
...
WifiManager.setNumAllowedChannels now needs a boolean persist arg.
Part of the fix for 1625953.
2009-05-22 09:35:56 -07:00
Android (Google) Code Review
76dce58435
am 81807831
: Merge change 1582 into donut
...
Merge commit '818078310759e3fbd227c578e20a54e935b1b92a'
* commit '818078310759e3fbd227c578e20a54e935b1b92a':
Teleca 2b changes.
2009-05-18 23:56:38 -07:00
Wink Saville
ead6928894
Teleca 2b changes.
2009-05-15 14:08:46 -07:00
Android (Google) Code Review
43954df1aa
Merge change 1725
...
* changes:
Findbug fixes in Settings app
2009-05-15 11:15:11 -07:00
svetoslavganov
99d7a9a952
am a05d0dc6
: Accessibility feature - settings (replacing 704 and merging with the latest Donut)
...
Merge commit 'a05d0dc67eb6aae169308dda25fe235226fa395b'
* commit 'a05d0dc67eb6aae169308dda25fe235226fa395b':
Accessibility feature - settings (replacing 704 and merging with the latest Donut)
2009-05-14 23:30:47 -07:00
svetoslavganov
a05d0dc67e
Accessibility feature - settings (replacing 704 and merging with the latest Donut)
2009-05-14 22:26:34 -07:00
Michael Chan
8762093e00
Findbug fixes in Settings app
...
modified: src/com/android/settings/ApnPreference.java
modified: src/com/android/settings/ApnSettings.java
modified: src/com/android/settings/BandMode.java
modified: src/com/android/settings/BatteryInfo.java
modified: src/com/android/settings/LanguageSettings.java
modified: src/com/android/settings/ManageApplications.java
modified: src/com/android/settings/RadioInfo.java
modified: src/com/android/settings/SdCardSettings.java
modified: src/com/android/settings/UsageStats.java
modified: src/com/android/settings/ZoneList.java
modified: src/com/android/settings/bluetooth/LocalBluetoothDevice.java
modified: src/com/android/settings/deviceinfo/Status.java
modified: src/com/android/settings/quicklaunch/QuickLaunchSettings.java
modified: src/com/android/settings/wifi/AccessPointDialog.java
modified: src/com/android/settings/wifi/AccessPointPreference.java
modified: src/com/android/settings/wifi/WifiLayer.java
modified: src/com/android/settings/wifi/WifiSettings.java
2009-05-14 17:47:02 -07:00