OSDN Git Service
Dianne Hackborn [Fri, 18 Sep 2009 01:13:10 +0000 (18:13 -0700)]
am
9341f5d8: am
f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit '
9341f5d81cffd972281e25b414ecaeb716ab16a8'
* commit '
9341f5d81cffd972281e25b414ecaeb716ab16a8':
Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Fri, 18 Sep 2009 01:08:35 +0000 (18:08 -0700)]
am
f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit '
f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp
* commit '
f66beeaea7d3654bee280644f4edc6d7215b0ee5':
Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Thu, 17 Sep 2009 22:15:46 +0000 (15:15 -0700)]
Follow along with startActivityPendingIntent() change.
Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02
Eric Fischer [Thu, 17 Sep 2009 22:26:40 +0000 (15:26 -0700)]
am
8b2397f7: (-s ours) am
909a9450: Import revised translations. DO NOT MERGE
Merge commit '
8b2397f734fe0e541eb1629e24b9447e6d482df9'
* commit '
8b2397f734fe0e541eb1629e24b9447e6d482df9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:27 +0000 (15:15 -0700)]
am
909a9450: Import revised translations. DO NOT MERGE
Merge commit '
909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp
* commit '
909a945031ec5ec372991de1d2ea1718f494ab9c':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:35:43 +0000 (14:35 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 17 Sep 2009 19:27:09 +0000 (12:27 -0700)]
am
87f0c26b: am
3faa23a2: Use new memory API; show memory used by bg and fg processes.
Merge commit '
87f0c26b31f14860f4db564362087d7bc91f27cb'
* commit '
87f0c26b31f14860f4db564362087d7bc91f27cb':
Use new memory API; show memory used by bg and fg processes.
Dianne Hackborn [Thu, 17 Sep 2009 19:20:04 +0000 (12:20 -0700)]
am
3faa23a2: Use new memory API; show memory used by bg and fg processes.
Merge commit '
3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp
* commit '
3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
Use new memory API; show memory used by bg and fg processes.
Amith Yamasani [Thu, 17 Sep 2009 19:17:56 +0000 (12:17 -0700)]
Suchi Amalapurapu [Thu, 17 Sep 2009 19:09:38 +0000 (12:09 -0700)]
am
04f3b821: am
5d9ee149: Merge change 25397 into eclair
Merge commit '
04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7'
* commit '
04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7':
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
Romain Guy [Thu, 17 Sep 2009 19:09:34 +0000 (12:09 -0700)]
am
f48fb571: am
9da119df: Merge change 25387 into eclair
Merge commit '
f48fb571e96696b26c1a0b2badb62bd38fe57a2d'
* commit '
f48fb571e96696b26c1a0b2badb62bd38fe57a2d':
Fix broken 9patch for hdpi.
Jaikumar Ganesh [Thu, 17 Sep 2009 19:09:30 +0000 (12:09 -0700)]
am
e60a8ebd: am
bb334392: Merge change 25354 into eclair
Merge commit '
e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'
* commit '
e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
Fix string name for bluetooth pairing and fix NPE
Debajit Ghosh [Thu, 17 Sep 2009 19:09:26 +0000 (12:09 -0700)]
am
5bfc786e: am
ae57dbd6: make power settings widget toggle sync, not background data
Merge commit '
5bfc786ebe258a349aba57aedbb38717ae696c13'
* commit '
5bfc786ebe258a349aba57aedbb38717ae696c13':
make power settings widget toggle sync, not background data
Dianne Hackborn [Thu, 17 Sep 2009 17:24:34 +0000 (10:24 -0700)]
Use new memory API; show memory used by bg and fg processes.
Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823
Amith Yamasani [Thu, 17 Sep 2009 17:46:44 +0000 (10:46 -0700)]
am
985f5efc: Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Merge commit '
985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp
* commit '
985f5efc8278e1a5c2170c3aba354a4c9367b741':
Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Amith Yamasani [Wed, 16 Sep 2009 19:43:50 +0000 (12:43 -0700)]
Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
Chung-yih Wang [Thu, 17 Sep 2009 16:52:42 +0000 (09:52 -0700)]
am
9752a844: am
dd1bb33e: Merge change 24646 into eclair
Merge commit '
9752a84445f224c28514c19645e8d640068d9df9'
* commit '
9752a84445f224c28514c19645e8d640068d9df9':
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Thu, 17 Sep 2009 16:52:38 +0000 (09:52 -0700)]
am
c26442e9: am
65f49474: Restore backlight brightness after restoring auto ALS mode.
Merge commit '
c26442e923d9deb5bea3fa78da661b1eb24bd965'
* commit '
c26442e923d9deb5bea3fa78da661b1eb24bd965':
Restore backlight brightness after restoring auto ALS mode.
Hung-ying Tyan [Thu, 17 Sep 2009 16:52:33 +0000 (09:52 -0700)]
am
e74b1c6a: am
10d3cf50: Enable cert install from sdcard in Settings...
Merge commit '
e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf'
* commit '
e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf':
Enable cert install from sdcard in Settings...
Chung-yih Wang [Thu, 17 Sep 2009 16:52:10 +0000 (09:52 -0700)]
am
7b22c686: am
dd498f90: Merge change 24870 into eclair
Merge commit '
7b22c686854263194e37250117c62457f9ba6e89'
* commit '
7b22c686854263194e37250117c62457f9ba6e89':
Transient patch for the WifiConfiguration change.
Suchi Amalapurapu [Thu, 17 Sep 2009 15:46:20 +0000 (08:46 -0700)]
am
5d9ee149: Merge change 25397 into eclair
Merge commit '
5d9ee1490258d56e0e1074b5e9b9a4bff39dd602' into eclair-plus-aosp
* commit '
5d9ee1490258d56e0e1074b5e9b9a4bff39dd602':
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
Romain Guy [Thu, 17 Sep 2009 15:42:22 +0000 (08:42 -0700)]
am
9da119df: Merge change 25387 into eclair
Merge commit '
9da119dff89ca8433e253dd1df19eaceba8e9641' into eclair-plus-aosp
* commit '
9da119dff89ca8433e253dd1df19eaceba8e9641':
Fix broken 9patch for hdpi.
Jaikumar Ganesh [Thu, 17 Sep 2009 15:41:11 +0000 (08:41 -0700)]
am
bb334392: Merge change 25354 into eclair
Merge commit '
bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp
* commit '
bb3343923c640461eecc4fac25f911224a16d056':
Fix string name for bluetooth pairing and fix NPE
Debajit Ghosh [Thu, 17 Sep 2009 15:40:17 +0000 (08:40 -0700)]
am
ae57dbd6: make power settings widget toggle sync, not background data
Merge commit '
ae57dbd618decb8cdc942756e283fadef659b2b6' into eclair-plus-aosp
* commit '
ae57dbd618decb8cdc942756e283fadef659b2b6':
make power settings widget toggle sync, not background data
Jaikumar Ganesh [Thu, 17 Sep 2009 13:41:40 +0000 (06:41 -0700)]
am
7b354367: am
a383452a: Merge change 25125 into eclair
Merge commit '
7b354367af8407dd6ee89fe4875047b1134eda9a'
* commit '
7b354367af8407dd6ee89fe4875047b1134eda9a':
Show name for incoming pairing requests.
Mike Lockwood [Thu, 17 Sep 2009 13:39:09 +0000 (06:39 -0700)]
am
5e10e111: am
cd03f532: Move backlight brightness from HardwareService to PowerManager
Merge commit '
5e10e11116087d27c14d1a07d36dc7959af6a97f'
* commit '
5e10e11116087d27c14d1a07d36dc7959af6a97f':
Move backlight brightness from HardwareService to PowerManager
Dan Murphy [Thu, 17 Sep 2009 06:57:34 +0000 (23:57 -0700)]
am
661df9b6: am
a096888f: apps/settings: Add auto/manual brightness control to Brightness settings
Merge commit '
661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e'
* commit '
661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e':
apps/settings: Add auto/manual brightness control to Brightness settings
Hung-ying Tyan [Thu, 17 Sep 2009 06:54:02 +0000 (23:54 -0700)]
am
7c20380e: am
a3aaf19e: Fix setting passwd string and vpn checkbox titles.
Merge commit '
7c20380ee1602f03e25583136825304c51fcb794'
* commit '
7c20380ee1602f03e25583136825304c51fcb794':
Fix setting passwd string and vpn checkbox titles.
Jaikumar Ganesh [Thu, 17 Sep 2009 06:53:54 +0000 (23:53 -0700)]
am
1b7ffcf4: (-s ours) am
5f23cb39: Modify settings for 2.1
Merge commit '
1b7ffcf4957191cbd805a4863ece75cd549575e9'
* commit '
1b7ffcf4957191cbd805a4863ece75cd549575e9':
Modify settings for 2.1
Android (Google) Code Review [Thu, 17 Sep 2009 05:05:12 +0000 (01:05 -0400)]
Merge change 25397 into eclair
* changes:
Fix issues with updating list when applications get installed while ManageApps is paused or stopped. When ManageApps gets started, the list of installed apps is retrieved from PackageManager and compared against the old list to figure out newly installed apps(since the app has been stopped) and also to weedout stale entries of packages which might have been deleted. Since the application objects themselves might have changed the list is usually refreshed with new objects. Deleted applications are taken care of right away by just removing from the List adapter. For newly added apps however, the size and label/resource info has to be loaded before being inserted in to the list since the list is already sorted. So just remove these entries from the list for now and let ADD_PKG message handle adding the new elements. Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and we have too many such entries one for each package.
Suchi Amalapurapu [Wed, 16 Sep 2009 23:38:10 +0000 (16:38 -0700)]
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
When ManageApps gets started, the list of installed apps is retrieved from PackageManager and
compared against the old list to figure out newly installed apps(since the app has been stopped) and
also to weedout stale entries of packages which might have been deleted.
Since the application objects themselves might have changed the list is usually refreshed with new objects.
Deleted applications are taken care of right away by just removing from the List adapter.
For newly added apps however, the size and label/resource info has to be loaded before being inserted in to
the list since the list is already sorted. So just remove these entries from the list for now and let
ADD_PKG message handle adding the new elements.
Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and
we have too many such entries one for each package.
Android (Google) Code Review [Wed, 16 Sep 2009 23:39:42 +0000 (19:39 -0400)]
Merge change 25387 into eclair
* changes:
Fix broken 9patch for hdpi.
Romain Guy [Wed, 16 Sep 2009 23:39:07 +0000 (16:39 -0700)]
Fix broken 9patch for hdpi.
Change-Id: I88c1bde1b0a19ccd9084889313e64a0a924f4bb0
Android (Google) Code Review [Wed, 16 Sep 2009 22:29:31 +0000 (18:29 -0400)]
Merge change 25354 into eclair
* changes:
Fix string name for bluetooth pairing and fix NPE
Jaikumar Ganesh [Wed, 16 Sep 2009 21:37:13 +0000 (14:37 -0700)]
Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
Jaikumar Ganesh [Wed, 16 Sep 2009 21:38:08 +0000 (14:38 -0700)]
Fix pairing string name for bluetooth.
Jaikumar Ganesh [Wed, 16 Sep 2009 18:56:11 +0000 (11:56 -0700)]
resolved conflicts for merge of
1b7ffcf4 to master
Debajit Ghosh [Wed, 16 Sep 2009 02:08:10 +0000 (19:08 -0700)]
make power settings widget toggle sync, not background data
Chung-yih Wang [Wed, 16 Sep 2009 10:32:58 +0000 (03:32 -0700)]
am
dd1bb33e: Merge change 24646 into eclair
Merge commit '
dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp
* commit '
dd1bb33e017a10f800a6da37042a91859acf56e9':
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Wed, 16 Sep 2009 10:28:28 +0000 (03:28 -0700)]
am
65f49474: Restore backlight brightness after restoring auto ALS mode.
Merge commit '
65f49474d69ab867d048fc2d6c53d456e585101f' into eclair-plus-aosp
* commit '
65f49474d69ab867d048fc2d6c53d456e585101f':
Restore backlight brightness after restoring auto ALS mode.
Android (Google) Code Review [Wed, 16 Sep 2009 10:26:54 +0000 (06:26 -0400)]
Merge change 24646 into eclair
* changes:
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Wed, 16 Sep 2009 10:20:22 +0000 (06:20 -0400)]
Restore backlight brightness after restoring auto ALS mode.
Fixes b/
2121632
Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Hung-ying Tyan [Wed, 16 Sep 2009 08:27:34 +0000 (01:27 -0700)]
am
10d3cf50: Enable cert install from sdcard in Settings...
Merge commit '
10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp
* commit '
10d3cf5082edb42f196ce0d5ac77c7a12b959599':
Enable cert install from sdcard in Settings...
Hung-ying Tyan [Tue, 15 Sep 2009 09:58:57 +0000 (17:58 +0800)]
Enable cert install from sdcard in Settings...
And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
Chung-yih Wang [Wed, 16 Sep 2009 07:34:32 +0000 (15:34 +0800)]
Aggregate the security settings for WiFi network configuration.
* Merge WPA and WPA2 PSK.
* Merge WPA-EAP and IEEE8021X.
* Remove unused field "private key password" in EAP configuration.
Chung-yih Wang [Wed, 16 Sep 2009 06:40:38 +0000 (23:40 -0700)]
am
dd498f90: Merge change 24870 into eclair
Merge commit '
dd498f901efd7984c38e18b548927c19c2b607f0' into eclair-plus-aosp
* commit '
dd498f901efd7984c38e18b548927c19c2b607f0':
Transient patch for the WifiConfiguration change.
Android (Google) Code Review [Wed, 16 Sep 2009 06:35:42 +0000 (02:35 -0400)]
Merge change 24870 into eclair
* changes:
Transient patch for the WifiConfiguration change.
Jaikumar Ganesh [Tue, 15 Sep 2009 21:40:32 +0000 (14:40 -0700)]
am
a383452a: Merge change 25125 into eclair
Merge commit '
a383452afd6576da5a56c8b1ef73750892e43636' into eclair-plus-aosp
* commit '
a383452afd6576da5a56c8b1ef73750892e43636':
Show name for incoming pairing requests.
Android (Google) Code Review [Tue, 15 Sep 2009 21:36:52 +0000 (17:36 -0400)]
Merge change 25125 into eclair
* changes:
Show name for incoming pairing requests.
Jaikumar Ganesh [Tue, 15 Sep 2009 21:07:22 +0000 (14:07 -0700)]
Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
Mike Lockwood [Tue, 15 Sep 2009 20:46:37 +0000 (13:46 -0700)]
am
cd03f532: Move backlight brightness from HardwareService to PowerManager
Merge commit '
cd03f5320d42290b1619933954a344b59dc55f4f' into eclair-plus-aosp
* commit '
cd03f5320d42290b1619933954a344b59dc55f4f':
Move backlight brightness from HardwareService to PowerManager
Nick Pelly [Tue, 15 Sep 2009 20:15:45 +0000 (13:15 -0700)]
am
f9dce06d: am
d6375e97: Merge change 24726 into eclair
Merge commit '
f9dce06d5ee028335ff445335303464ebb403901'
* commit '
f9dce06d5ee028335ff445335303464ebb403901':
Update AndroidManifest.xml for new Intent locations.
Xianzhu Wang [Tue, 15 Sep 2009 20:13:42 +0000 (13:13 -0700)]
am
e8b40cb8: 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 '
e8b40cb857bfaab26f64d688d98b592cca70b089'
* commit '
e8b40cb857bfaab26f64d688d98b592cca70b089':
Regenerate timezones.xml after adding Asia/Shanghai timezone for
Mike Lockwood [Tue, 15 Sep 2009 18:39:47 +0000 (14:39 -0400)]
Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/
2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ic4faa008357fd3d74225ba90f05801c5127fd8c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dan Murphy [Tue, 15 Sep 2009 14:33:14 +0000 (07:33 -0700)]
am
a096888f: apps/settings: Add auto/manual brightness control to Brightness settings
Merge commit '
a096888f3c7e14723168c323f0ffdb2473adf5d3' into eclair-plus-aosp
* commit '
a096888f3c7e14723168c323f0ffdb2473adf5d3':
apps/settings: Add auto/manual brightness control to Brightness settings
Dan Murphy [Thu, 27 Aug 2009 20:05:23 +0000 (15:05 -0500)]
apps/settings: Add auto/manual brightness control to Brightness settings
Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.
These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.
If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.
Change-Id: I512c9d5dd72ddd831b33eb8fcd4680e2fc7f786e
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chung-yih Wang [Mon, 14 Sep 2009 06:25:09 +0000 (14:25 +0800)]
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.
Hung-ying Tyan [Mon, 14 Sep 2009 06:08:01 +0000 (23:08 -0700)]
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.
Jaikumar Ganesh [Mon, 14 Sep 2009 06:07:55 +0000 (23:07 -0700)]
am
5f23cb39: Modify settings for 2.1
Merge commit '
5f23cb39a1bd9c319383108c209fca7f0256894b' into eclair-plus-aosp
* commit '
5f23cb39a1bd9c319383108c209fca7f0256894b':
Modify settings for 2.1
Hung-ying Tyan [Fri, 11 Sep 2009 17:31:11 +0000 (01:31 +0800)]
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.
Nick Pelly [Fri, 11 Sep 2009 19:01:07 +0000 (12:01 -0700)]
am
d6375e97: Merge change 24726 into eclair
Merge commit '
d6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp
* commit '
d6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
Update AndroidManifest.xml for new Intent locations.
Jaikumar Ganesh [Fri, 11 Sep 2009 16:45:11 +0000 (09:45 -0700)]
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.
Android (Google) Code Review [Fri, 11 Sep 2009 18:55:44 +0000 (14:55 -0400)]
Merge change 24726 into eclair
* changes:
Update AndroidManifest.xml for new Intent locations.
Nick Pelly [Fri, 11 Sep 2009 18:41:59 +0000 (11:41 -0700)]
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
Xianzhu Wang [Fri, 11 Sep 2009 17:34:42 +0000 (10:34 -0700)]
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
Xianzhu Wang [Fri, 11 Sep 2009 06:41:05 +0000 (14:41 +0800)]
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".
Nick Pelly [Fri, 11 Sep 2009 02:06:37 +0000 (19:06 -0700)]
am
3ca2df1c: am
16cc8631: Update application for Bluetooth API changes.
Merge commit '
3ca2df1ce5683fe9713290f7819b54cea3a2cdfa'
* commit '
3ca2df1ce5683fe9713290f7819b54cea3a2cdfa':
Update application for Bluetooth API changes.
Nick Pelly [Fri, 11 Sep 2009 02:01:20 +0000 (19:01 -0700)]
am
16cc8631: Update application for Bluetooth API changes.
Merge commit '
16cc86315d7a8e1f6a0f3083d0a810a7cb097832' into eclair-plus-aosp
* commit '
16cc86315d7a8e1f6a0f3083d0a810a7cb097832':
Update application for Bluetooth API changes.
Nick Pelly [Thu, 10 Sep 2009 00:46:25 +0000 (17:46 -0700)]
Update application for Bluetooth API changes.
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
Dianne Hackborn [Thu, 10 Sep 2009 20:11:21 +0000 (13:11 -0700)]
am
21ee9c24: am
cded8478: Merge change 24553 into eclair
Merge commit '
21ee9c240352b66f4f13a3fff80c7322e9745d7a'
* commit '
21ee9c240352b66f4f13a3fff80c7322e9745d7a':
Make running services show dependent processes.
Dianne Hackborn [Thu, 10 Sep 2009 20:05:53 +0000 (13:05 -0700)]
am
cded8478: Merge change 24553 into eclair
Merge commit '
cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp
* commit '
cded847838c726342bfe56e69d417d160c73f212':
Make running services show dependent processes.
Android (Google) Code Review [Thu, 10 Sep 2009 19:57:57 +0000 (15:57 -0400)]
Merge change 24553 into eclair
* changes:
Make running services show dependent processes.
Marco Nelissen [Thu, 10 Sep 2009 19:42:06 +0000 (12:42 -0700)]
am
0da7d948: am
e07eb497: Merge change 24555 into eclair
Merge commit '
0da7d948df0ef30dffe4ae27388ef5c648425ea6'
* commit '
0da7d948df0ef30dffe4ae27388ef5c648425ea6':
Allow setting a silent ringtone (bug
1600056).
Marco Nelissen [Thu, 10 Sep 2009 19:38:23 +0000 (12:38 -0700)]
am
e07eb497: Merge change 24555 into eclair
Merge commit '
e07eb49793ef2d4fd494717159ebdd3aaef41e08' into eclair-plus-aosp
* commit '
e07eb49793ef2d4fd494717159ebdd3aaef41e08':
Allow setting a silent ringtone (bug
1600056).
Android (Google) Code Review [Thu, 10 Sep 2009 19:33:55 +0000 (15:33 -0400)]
Merge change 24555 into eclair
* changes:
Allow setting a silent ringtone (bug
1600056).
Marco Nelissen [Thu, 10 Sep 2009 19:11:33 +0000 (12:11 -0700)]
Allow setting a silent ringtone (bug
1600056).
Dianne Hackborn [Thu, 10 Sep 2009 18:55:42 +0000 (11:55 -0700)]
Make running services show dependent processes.
And other various improvement and cleanup.
Change-Id: I0a33ab2876c8f409cd3cfecbbac574563ef1a162
Hung-ying Tyan [Thu, 10 Sep 2009 16:23:24 +0000 (09:23 -0700)]
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
Hung-ying Tyan [Thu, 10 Sep 2009 09:06:34 +0000 (02:06 -0700)]
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
Hung-ying Tyan [Thu, 10 Sep 2009 04:43:40 +0000 (12:43 +0800)]
Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
Jean-Michel Trivi [Wed, 9 Sep 2009 23:31:28 +0000 (16:31 -0700)]
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
Jaikumar Ganesh [Wed, 9 Sep 2009 23:31:11 +0000 (16:31 -0700)]
am
c9311040: am
6ee7dd09: Merge change 24435 into eclair
Merge commit '
c93110409c05bef4be5428ef36099a586828cbb2'
* commit '
c93110409c05bef4be5428ef36099a586828cbb2':
Fix display strings and enter passkey handling.
Nick Pelly [Wed, 9 Sep 2009 23:28:37 +0000 (16:28 -0700)]
am
8a6730df: am
843b4ee1: Merge change 24276 into eclair
Merge commit '
8a6730df320b2fa10ac11ea1aad06d85bbed31e4'
* commit '
8a6730df320b2fa10ac11ea1aad06d85bbed31e4':
Update application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Wed, 9 Sep 2009 23:28:20 +0000 (16:28 -0700)]
am
3b83477f: am
1e451997: Merge change 24230 into eclair
Merge commit '
3b83477fe391ea6b9eb6ff783283a3f3002e8e7a'
* commit '
3b83477fe391ea6b9eb6ff783283a3f3002e8e7a':
Update application for Bluetooth API change.
Marco Nelissen [Wed, 9 Sep 2009 23:27:55 +0000 (16:27 -0700)]
Jean-Michel Trivi [Wed, 9 Sep 2009 22:42:27 +0000 (15:42 -0700)]
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
Android (Google) Code Review [Wed, 9 Sep 2009 22:38:11 +0000 (18:38 -0400)]
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().
Jean-Michel Trivi [Wed, 9 Sep 2009 22:13:38 +0000 (15:13 -0700)]
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().
Jaikumar Ganesh [Wed, 9 Sep 2009 22:14:00 +0000 (15:14 -0700)]
am
6ee7dd09: Merge change 24435 into eclair
Merge commit '
6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp
* commit '
6ee7dd09138363737805ae1e6e93649959c6ab83':
Fix display strings and enter passkey handling.
Android (Google) Code Review [Wed, 9 Sep 2009 22:06:30 +0000 (18:06 -0400)]
Merge change 24435 into eclair
* changes:
Fix display strings and enter passkey handling.
Jaikumar Ganesh [Wed, 9 Sep 2009 21:57:19 +0000 (14:57 -0700)]
Fix display strings and enter passkey handling.
Nick Pelly [Wed, 9 Sep 2009 18:39:11 +0000 (11:39 -0700)]
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.
Android (Google) Code Review [Wed, 9 Sep 2009 18:34:52 +0000 (14:34 -0400)]
Merge change 24276 into eclair
* changes:
Update application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Wed, 9 Sep 2009 18:34:26 +0000 (11:34 -0700)]
am
1e451997: Merge change 24230 into eclair
Merge commit '
1e4519979b32957698a6825eb6eb61bd85dd7370' into eclair-plus-aosp
* commit '
1e4519979b32957698a6825eb6eb61bd85dd7370':
Update application for Bluetooth API change.
Android (Google) Code Review [Wed, 9 Sep 2009 18:30:26 +0000 (14:30 -0400)]
Merge change 24230 into eclair
* changes:
Update application for Bluetooth API change.
Marco Nelissen [Wed, 9 Sep 2009 17:59:53 +0000 (10:59 -0700)]
Eric Fischer [Wed, 9 Sep 2009 17:58:07 +0000 (10:58 -0700)]
am
76872f5a: (-s ours) am
140fb90a: Import revised translations. DO NOT MERGE
Merge commit '
76872f5a12e3f697a90c08bc717918fa7469d265'
* commit '
76872f5a12e3f697a90c08bc717918fa7469d265':
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 9 Sep 2009 16:06:40 +0000 (09:06 -0700)]
Remove logging.
Nick Pelly [Wed, 9 Sep 2009 00:49:57 +0000 (17:49 -0700)]
Update application for Bluetooth API change: deprecation of BluetoothError.
Eric Fischer [Wed, 9 Sep 2009 00:09:19 +0000 (17:09 -0700)]
am
140fb90a: Import revised translations. DO NOT MERGE
Merge commit '
140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp
* commit '
140fb90a5cfc6e146e006350edfb41a9978ad105':
Import revised translations. DO NOT MERGE