The Android Open Source Project
b8547bf12c
am 9f78ffb2
: am 615f8446
: reconcile main tree with open-source eclair
...
Merge commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81'
* commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81':
android-2.1_r1 snapshot
2010-02-05 14:22:33 -08:00
Andy Stadler
93fd30f9c7
Merge "Fix device administrator "add" logic"
2010-02-05 10:47:04 -08:00
The Android Open Source Project
9f78ffb27e
am 615f8446
: reconcile main tree with open-source eclair
...
Merge commit '615f84460214276708732c8f43ba4e04df30a14d' into eclair-plus-aosp
* commit '615f84460214276708732c8f43ba4e04df30a14d':
android-2.1_r1 snapshot
2010-02-05 08:48:16 -08:00
The Android Open Source Project
615f844602
reconcile main tree with open-source eclair
2010-02-05 08:09:40 -08:00
Chia-chi Yeh
8b3ca621be
Merge "WifiSettings: enable all networks only when connected, disconnected, or failed."
2010-02-05 02:35:01 -08:00
Chia-chi Yeh
af7b2d8a23
WifiSettings: enable all networks only when connected, disconnected, or failed.
2010-02-05 18:18:51 +08:00
Andrew Stadler
4df6edb1ac
Fix device administrator "add" logic
...
Due to a missing "else" the logic to activate a device administrator
was immediately falling through into the logic to remove it. As a result,
the add was immediately countermanded by a remove.
2010-02-05 01:00:13 -08:00
Chung-yih Wang
1e39df1002
Merge "WifiSettings: enable all networks when state is changed."
2010-02-05 00:51:58 -08:00
Chia-chi Yeh
7d6bfbfc30
WifiSettings: enable all networks when state is changed.
2010-02-05 16:28:39 +08:00
Charles Chen
87061f5065
Merge "Fixing bug 2418114. Added a check to make sure the TTS sample string for a language-country combination is available before trying to use it."
2010-02-04 17:13:12 -08:00
Charles Chen
8a37e6190b
Fixing bug 2418114. Added a check to make sure the TTS sample string for
...
a language-country combination is available before trying to use it.
2010-02-04 15:52:30 -08:00
Robert Greenwalt
3901edbdf5
First pass at USB-only tether settings.
...
bug:2281900
2010-02-04 09:17:41 -08:00
Chia-chi Yeh
9dee8a96c5
WifiSettings: tweak the order of calls to registerReceiver() to make the UI better.
2010-02-04 16:16:25 +08:00
Christopher Tate
a5a67306a4
Add 'restore on app install?" to Privacy settings UI
...
Change-Id: I6fe4b05596881ae26ebf536d9774fb3033aa15f3
2010-02-03 15:09:20 -08:00
Suchi Amalapurapu
a833d10e3e
Add new broadcast to pick up apps from sdcard
2010-02-03 11:21:49 -08:00
Amith Yamasani
431fa27d64
Fix an NPE in Volume dialog when notification volume is tied to ringer volume.
2010-02-03 09:47:36 -08:00
Chia-chi Yeh
065cd4be64
WifiSettings: rename WifiSettings2 to WifiSettings.
2010-02-03 15:56:55 +08:00
Chia-chi Yeh
df90dd9f55
WifiSettings: remove dead code.
2010-02-03 15:16:54 +08:00
San Mehat
c4e8d7e21a
Settings: Refactor for StorageManager namespace change
...
Signed-off-by: San Mehat <san@google.com >
2010-02-02 12:54:46 -08:00
San Mehat
4a3d713f3a
Settings: Refactor for new API & remove obsolete setting
...
Signed-off-by: San Mehat <san@google.com >
2010-02-02 11:24:29 -08:00
Chia-chi Yeh
48090d4066
WifiSettings: revise and add support for editing EAP networks.
...
Use arrays.xml to store translations for enumerations;
avoid race conditions happened when pop up menu or dialog;
avoid saving configurations with networks disabled;
use the same layout for all the dialogs;
support editing EAP networks;
only unlock keystore before connecting;
and many bug fixes I cannot remember.
The number of lines in the new code is about 1/3 of the old one,
and it improves the readability a lot!
2010-02-02 18:31:58 +08:00
Suchi Amalapurapu
497acbaa59
Merge "Convert menu options to tabs Add new tab for apps on sd"
2010-01-29 19:34:30 -08:00
Dianne Hackborn
33111717d5
Update to follow password mode->quality API change.
2010-01-29 17:07:17 -08:00
The Android Open Source Project
d092ffc342
reconcile android-2.1_r1 snapshot
2010-01-29 14:09:27 -08:00
Irfan Sheriff
454b7a4a04
Merge "Allow channel count modification on userdebug"
2010-01-28 20:45:57 -08:00
Amith Yamasani
adeafd3281
Merge "Update display icon for settings top-level."
2010-01-28 15:13:16 -08:00
Amith Yamasani
bd2dbbdc60
Update display icon for settings top-level.
2010-01-28 14:54:24 -08:00
Suchi Amalapurapu
747ea55fce
Convert menu options to tabs
...
Add new tab for apps on sd
2010-01-28 13:53:35 -08:00
Irfan Sheriff
0a57284e15
Allow channel count modification on userdebug
...
Bug: 2378844
Change-Id: I62bca602c3fe1fefdc4a4517573b2c3db9d53a1f
2010-01-28 12:26:37 -08:00
Dianne Hackborn
8cecf89cec
Update to follow device policy changes.
2010-01-28 11:03:09 -08:00
Dianne Hackborn
61daf83ca8
Update settings UI to support multiple device admins.
2010-01-27 17:27:17 -08:00
Irfan Sheriff
9e0135fd45
am 8e79fda8
: am ad76f17a
: Remove regulatory group setting in advanced wifi setting
...
Merge commit '8e79fda826f78afe063763183d31398cdee5ac84'
* commit '8e79fda826f78afe063763183d31398cdee5ac84':
Remove regulatory group setting in advanced wifi setting
2010-01-27 15:52:35 -08:00
Dianne Hackborn
b885afe4e7
More device admin work:
...
- Show a warning before removing an admin, if desired.
- Additional message that can be shown when adding an admin.
2010-01-27 13:29:14 -08:00
Mike LeBeau
d4449a81cd
Remove trailing "settings" from the strings for the items under the
...
new "Voice input & output" top-level settings section.
2010-01-26 22:44:45 -05:00
Dianne Hackborn
2842903337
Work on the device admin settings UI.
...
Improve the look of the UI, and add the confirmation screen
for enabling an administrator. This uses the new framework APIs
to show its description and policies it will control.
2010-01-26 11:09:32 -08:00
Daniel Sandler
e67c881090
Add android.settings.DEVICE_INFO_SETTINGS.
...
Allows apps to jump straight to the DeviceInfoSettings
Activity.
2010-01-26 10:03:10 -05:00
Mike LeBeau
31ea29a9ed
Merge "Add a new "Voice input & output" top-level section of system settings. This replaces the existing "Text-to-speech" section, placing that inside, along with a link to the newly exposed voice search settings (which will soon be expanded) and a link to the LatinIME settings (pending a link to a new section in LatinIME for just voice settings, including the comma setting and a new input language setting)."
2010-01-25 18:37:50 -08:00
Michael Chan
88d071fce4
am 3a6b2df2
: am 324ab848
: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair
...
Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a'
* commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
b/2370089 Pop the dock dialog above the keyguard
2010-01-25 18:09:45 -08:00
Mike LeBeau
92c3352f89
Add a new "Voice input & output" top-level section of system settings.
...
This replaces the existing "Text-to-speech" section, placing that
inside, along with a link to the newly exposed voice search settings
(which will soon be expanded) and a link to the LatinIME settings
(pending a link to a new section in LatinIME for just voice settings,
including the comma setting and a new input language setting).
The VoiceSearch and LatinIME links are smart enough to remove themselves
if those don't exist on the device.
2010-01-25 19:30:30 -05:00
Amith Yamasani
7bc9b26b74
Merge "Refactor settings hierarchy and clump all volumes in one dialog."
2010-01-25 15:06:21 -08:00
Amith Yamasani
992f10240d
Refactor settings hierarchy and clump all volumes in one dialog.
...
Bug:2362077 Bug:2312836 Bug:2166486
Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
2010-01-25 14:58:34 -08:00
Charles Chen
0acb377706
Merge "Changing TextToSpeechSettings to query for the sample text strings provided by plugins rather than using hardcoded sample text."
2010-01-25 14:04:41 -08:00
Charles Chen
4df6c79f41
Changing TextToSpeechSettings to query for the sample text
...
strings provided by plugins rather than using hardcoded sample
text.
2010-01-25 13:08:08 -08:00
Bjorn Bringert
edc585b644
Merge "Fix GoogleSettings check in PrivacySettings"
2010-01-25 12:45:17 -08:00
Bjorn Bringert
ecfeaffdfa
Fix GoogleSettings check in PrivacySettings
...
GoogleSettingsProvider has moved to a new package as part of unbundling.
This broke the check used to decide whether to show the "Backup my
settings" preference. To make this more robust to package name changes,
I changed the code to look up the settings provider by authority
instead of looking for the package that contains it.
Fixes http://b/issue?id=2390945
Change-Id: Iaec3152faddbd938fc02f9f2dde748819c1d5cdf
2010-01-25 20:39:55 +00:00
Eric Fischer
3587f3d1bb
am 6795dd59
: (-s ours) am 359b2bcc
: Check in translations for new Settings strings. DO NOT MERGE
...
Merge commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7'
* commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7':
Check in translations for new Settings strings. DO NOT MERGE
2010-01-25 09:09:23 -08:00
Michael Chan
4691219ce5
am fcd4e7fe
: am 04bdae75
: Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
...
Merge commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c'
* commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c':
b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
2010-01-22 18:49:07 -08:00
Amith Yamasani
6043f7f0b3
am b9f29667
: am 63c6a309
: Merge "Add dock icon for top-level settings. #2367275 " into eclair
...
Merge commit 'b9f2966707004b84760b498d8fc05b3c8f144f59'
* commit 'b9f2966707004b84760b498d8fc05b3c8f144f59':
Add dock icon for top-level settings. #2367275
2010-01-22 12:36:04 -08:00
Michael Chan
d0c57fdc02
am 97ed3f4b
: am 3fe86a34
: b/2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
...
Merge commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7'
* commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7':
b/2332395 Disable BT when undocked if BT was off to at docking time
2010-01-22 12:35:59 -08:00
Amith Yamasani
d4237f884a
am 942feaa2
: am 6ff80dcf
: Fix #2377870 : NPE in Dock settings
...
Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'
* commit '942feaa2eff1153564b98a01f644083c1b58cf2d':
Fix #2377870 : NPE in Dock settings
2010-01-21 17:54:53 -08:00