Commit Graph

49467 Commits

Author SHA1 Message Date
Eric Fischer
c419908de7 am 8b2397f7: (-s ours) am 909a9450: Import revised translations. DO NOT MERGE
Merge commit '8b2397f734fe0e541eb1629e24b9447e6d482df9'

* commit '8b2397f734fe0e541eb1629e24b9447e6d482df9':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:26:40 -07:00
Eric Fischer
8b2397f734 am 909a9450: Import revised translations. DO NOT MERGE
Merge commit '909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp

* commit '909a945031ec5ec372991de1d2ea1718f494ab9c':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:15:27 -07:00
Eric Fischer
909a945031 Import revised translations. DO NOT MERGE 2009-09-17 14:35:43 -07:00
Dianne Hackborn
69cdd4f865 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.
2009-09-17 12:27:09 -07:00
Dianne Hackborn
87f0c26b31 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.
2009-09-17 12:20:04 -07:00
Amith Yamasani
92ee780ecd am 88da45e5: am 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Merge commit '88da45e51ba137a7e83992efc9b63babad42d57c'

* commit '88da45e51ba137a7e83992efc9b63babad42d57c':
  Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
2009-09-17 12:17:56 -07:00
Suchi Amalapurapu
4a73085440 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.
2009-09-17 12:09:38 -07:00
Romain Guy
5c2919d6ae am f48fb571: am 9da119df: Merge change 25387 into eclair
Merge commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d'

* commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d':
  Fix broken 9patch for hdpi.
2009-09-17 12:09:34 -07:00
Jaikumar Ganesh
18f9d189ba am e60a8ebd: am bb334392: Merge change 25354 into eclair
Merge commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'

* commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
  Fix string name for bluetooth pairing and fix NPE
2009-09-17 12:09:30 -07:00
Debajit Ghosh
2633e39108 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
2009-09-17 12:09:26 -07:00
Dianne Hackborn
3faa23a2b0 Use new memory API; show memory used by bg and fg processes.
Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823
2009-09-17 12:07:00 -07:00
Amith Yamasani
88da45e51b 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
2009-09-17 10:46:44 -07:00
Amith Yamasani
985f5efc82 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.
2009-09-17 10:39:10 -07:00
Chung-yih Wang
9e1b267ebb am 9752a844: am dd1bb33e: Merge change 24646 into eclair
Merge commit '9752a84445f224c28514c19645e8d640068d9df9'

* commit '9752a84445f224c28514c19645e8d640068d9df9':
  Aggregate the security settings for WiFi network configuration.
2009-09-17 09:52:42 -07:00
Mike Lockwood
dc4a724c84 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.
2009-09-17 09:52:38 -07:00
Hung-ying Tyan
ccaeeb6e1d am e74b1c6a: am 10d3cf50: Enable cert install from sdcard in Settings...
Merge commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf'

* commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf':
  Enable cert install from sdcard in Settings...
2009-09-17 09:52:33 -07:00
Chung-yih Wang
5143dcb0b3 am 7b22c686: am dd498f90: Merge change 24870 into eclair
Merge commit '7b22c686854263194e37250117c62457f9ba6e89'

* commit '7b22c686854263194e37250117c62457f9ba6e89':
  Transient patch for the WifiConfiguration change.
2009-09-17 09:52:10 -07:00
Suchi Amalapurapu
04f3b82137 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.
2009-09-17 08:46:20 -07:00
Romain Guy
f48fb571e9 am 9da119df: Merge change 25387 into eclair
Merge commit '9da119dff89ca8433e253dd1df19eaceba8e9641' into eclair-plus-aosp

* commit '9da119dff89ca8433e253dd1df19eaceba8e9641':
  Fix broken 9patch for hdpi.
2009-09-17 08:42:22 -07:00
Jaikumar Ganesh
e60a8ebd0e 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
2009-09-17 08:41:11 -07:00
Debajit Ghosh
5bfc786ebe 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
2009-09-17 08:40:17 -07:00
Jaikumar Ganesh
71328bfc26 am 7b354367: am a383452a: Merge change 25125 into eclair
Merge commit '7b354367af8407dd6ee89fe4875047b1134eda9a'

* commit '7b354367af8407dd6ee89fe4875047b1134eda9a':
  Show name for incoming pairing requests.
2009-09-17 06:41:40 -07:00
Mike Lockwood
3f8c5d812d am 5e10e111: am cd03f532: Move backlight brightness from HardwareService to PowerManager
Merge commit '5e10e11116087d27c14d1a07d36dc7959af6a97f'

* commit '5e10e11116087d27c14d1a07d36dc7959af6a97f':
  Move backlight brightness from HardwareService to PowerManager
2009-09-17 06:39:09 -07:00
Dan Murphy
a1e0455013 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
2009-09-16 23:57:34 -07:00
Hung-ying Tyan
2044fa9f06 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.
2009-09-16 23:54:02 -07:00
Jaikumar Ganesh
243e3fe0a4 am 1b7ffcf4: (-s ours) am 5f23cb39: Modify settings for 2.1
Merge commit '1b7ffcf4957191cbd805a4863ece75cd549575e9'

* commit '1b7ffcf4957191cbd805a4863ece75cd549575e9':
  Modify settings for 2.1
2009-09-16 23:53:54 -07:00
Android (Google) Code Review
5d9ee14902 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.
2009-09-17 01:05:12 -04:00
Suchi Amalapurapu
355b32faa9 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.
2009-09-16 17:12:08 -07:00
Android (Google) Code Review
9da119dff8 Merge change 25387 into eclair
* changes:
  Fix broken 9patch for hdpi.
2009-09-16 19:39:42 -04:00
Romain Guy
32b31cacc5 Fix broken 9patch for hdpi.
Change-Id: I88c1bde1b0a19ccd9084889313e64a0a924f4bb0
2009-09-16 16:39:07 -07:00
Android (Google) Code Review
bb3343923c Merge change 25354 into eclair
* changes:
  Fix string name for bluetooth pairing and fix NPE
2009-09-16 18:29:31 -04:00
Jaikumar Ganesh
363bd5554e Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
2009-09-16 14:56:08 -07:00
Jaikumar Ganesh
4d229eba38 Fix pairing string name for bluetooth. 2009-09-16 14:38:08 -07:00
Jaikumar Ganesh
435ad270b5 resolved conflicts for merge of 1b7ffcf4 to master 2009-09-16 11:56:11 -07:00
Debajit Ghosh
ae57dbd618 make power settings widget toggle sync, not background data 2009-09-16 11:29:16 -07:00
Chung-yih Wang
9752a84445 am dd1bb33e: Merge change 24646 into eclair
Merge commit 'dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp

* commit 'dd1bb33e017a10f800a6da37042a91859acf56e9':
  Aggregate the security settings for WiFi network configuration.
2009-09-16 03:32:58 -07:00
Mike Lockwood
c26442e923 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.
2009-09-16 03:28:28 -07:00
Android (Google) Code Review
dd1bb33e01 Merge change 24646 into eclair
* changes:
  Aggregate the security settings for WiFi network configuration.
2009-09-16 06:26:54 -04:00
Mike Lockwood
65f49474d6 Restore backlight brightness after restoring auto ALS mode.
Fixes b/2121632

Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-16 06:22:19 -04:00
Hung-ying Tyan
e74b1c6ae4 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...
2009-09-16 01:27:34 -07:00
Hung-ying Tyan
10d3cf5082 Enable cert install from sdcard in Settings...
And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
2009-09-16 15:52:02 +08:00
Chung-yih Wang
98f447fe2d 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.
2009-09-16 15:34:32 +08:00
Chung-yih Wang
7b22c68685 am dd498f90: Merge change 24870 into eclair
Merge commit 'dd498f901efd7984c38e18b548927c19c2b607f0' into eclair-plus-aosp

* commit 'dd498f901efd7984c38e18b548927c19c2b607f0':
  Transient patch for the WifiConfiguration change.
2009-09-15 23:40:38 -07:00
Android (Google) Code Review
dd498f901e Merge change 24870 into eclair
* changes:
  Transient patch for the WifiConfiguration change.
2009-09-16 02:35:42 -04:00
Jaikumar Ganesh
7b354367af am a383452a: Merge change 25125 into eclair
Merge commit 'a383452afd6576da5a56c8b1ef73750892e43636' into eclair-plus-aosp

* commit 'a383452afd6576da5a56c8b1ef73750892e43636':
  Show name for incoming pairing requests.
2009-09-15 14:40:32 -07:00
Android (Google) Code Review
a383452afd Merge change 25125 into eclair
* changes:
  Show name for incoming pairing requests.
2009-09-15 17:36:52 -04:00
Jaikumar Ganesh
3eb43fe7a4 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.
2009-09-15 14:07:22 -07:00
Mike Lockwood
5e10e11116 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
2009-09-15 13:46:37 -07:00
Nick Pelly
1e3fe94d51 am f9dce06d: am d6375e97: Merge change 24726 into eclair
Merge commit 'f9dce06d5ee028335ff445335303464ebb403901'

* commit 'f9dce06d5ee028335ff445335303464ebb403901':
  Update AndroidManifest.xml for new Intent locations.
2009-09-15 13:15:45 -07:00
Xianzhu Wang
8f873a9a5e 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
2009-09-15 13:13:42 -07:00