Commit Graph

661 Commits

Author SHA1 Message Date
Ken Shirriff
6b0d2f2c09 am 7d1e0865: Adjust widget size.
Merge commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1' into eclair-plus-aosp

* commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1':
  Adjust widget size.
2009-09-21 17:39:49 -07:00
Ken Shirriff
7d1e086504 Adjust widget size.
Without this change, the widget cannot be placed on the home screen in
landscape mode because it's thought to be too big.
2009-09-21 09:32:11 -07:00
Suchi Amalapurapu
5466090cb8 am 9e710510: Merge change 26022 into eclair
Merge commit '9e7105108ba0aecc961b2ecc3003a57242c982bc' into eclair-plus-aosp

* commit '9e7105108ba0aecc961b2ecc3003a57242c982bc':
  Change default filter to third party when launched via settings and all apps when launched via
2009-09-21 09:30:20 -07:00
Android (Google) Code Review
9e7105108b Merge change 26022 into eclair
* changes:
  Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.
2009-09-21 12:23:14 -04:00
Chung-yih Wang
451ada665d am e32e8baa: Fix the typo in phase2 options.
Merge commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp

* commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d':
  Fix the typo in phase2 options.
2009-09-21 03:49:13 -07:00
Chung-yih Wang
e32e8baa44 Fix the typo in phase2 options.
MSCHAP2 => MSCHAPV2
2009-09-21 18:42:55 +08:00
Amith Yamasani
35b21807e8 am d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption per app.
Merge commit 'd459bebd89756a8b735feb6f27bd864b0427feb7' into eclair-plus-aosp

* commit 'd459bebd89756a8b735feb6f27bd864b0427feb7':
  Use the ratio of different CPU speeds to compute CPU power consumption per app.
2009-09-20 17:03:52 -07:00
Amith Yamasani
d459bebd89 Use the ratio of different CPU speeds to compute CPU power consumption per app. 2009-09-20 15:57:39 -07:00
Suchi Amalapurapu
fe4a2bc43f Change default filter to third party when launched via settings and all apps when launched via
low storage. Update string name.
fix padding for Force Stop button
Change message when clearing application data.
2009-09-20 15:11:44 -07:00
Ken Shirriff
06a20451d8 am 8cd8b0b7: Merge change 25969 into eclair
Merge commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d' into eclair-plus-aosp

* commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d':
  Fix power widget dimensions.
2009-09-20 13:25:03 -07:00
Android (Google) Code Review
8cd8b0b7ed Merge change 25969 into eclair
* changes:
  Fix power widget dimensions.
2009-09-20 16:17:52 -04:00
Ken Shirriff
f16b2e9b63 Fix power widget dimensions.
The widget was taking 2 units vertically on some devices.
2009-09-20 11:04:05 -07:00
Benny Wong
6c1ac291d9 am dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Merge commit 'dc543d289884386faa1361d8fca5536a59c72c1a' into eclair-plus-aosp

* commit 'dc543d289884386faa1361d8fca5536a59c72c1a':
  Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
2009-09-18 10:07:00 -07:00
Benny Wong
dc543d2898 Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Original GID: 1062
2009-09-18 07:54:53 -07:00
Dianne Hackborn
9341f5d81c am f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp

* commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5':
  Follow along with startActivityPendingIntent() change.
2009-09-17 18:08:35 -07:00
Dianne Hackborn
f66beeaea7 Follow along with startActivityPendingIntent() change.
Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02
2009-09-17 18:01:57 -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
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
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
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
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
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
Mike Lockwood
cd03f5320d 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>
2009-09-15 15:24:14 -04:00
Dan Murphy
661df9b62a 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
2009-09-15 07:33:14 -07:00
Dan Murphy
a096888f3c 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>
2009-09-14 21:42:56 -04:00
Chung-yih Wang
210e7acf82 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.
2009-09-14 14:25:09 +08:00