1573 Commits

Author SHA1 Message Date
Amith Yamasani
b0c8cd25fb am 1283fd9e: am 86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '1283fd9e7f6fc2f7b74f916ad3033ae1bdd1a76f' into eclair-mr2-plus-aosp

* commit '1283fd9e7f6fc2f7b74f916ad3033ae1bdd1a76f':
  Fix 2233444 (No IME).
  Revert "Revert "Fix notification bar performance.""
  Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
2009-11-03 15:31:59 -08:00
Amith Yamasani
1209c012a2 am 86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '86396f97c998358390d912903395828ee244e2d5' into eclair-plus-aosp

* commit '86396f97c998358390d912903395828ee244e2d5':
  Fix 2233444 (No IME).
  Revert "Revert "Fix notification bar performance.""
  Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
2009-11-03 15:26:41 -08:00
Amith Yamasani
1283fd9e7f am 86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '86396f97c998358390d912903395828ee244e2d5' into eclair-mr2

* commit '86396f97c998358390d912903395828ee244e2d5':
  Fix 2233444 (No IME).
  Revert "Revert "Fix notification bar performance.""
  Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
2009-11-03 15:26:12 -08:00
Android Git Automerger
fe6168b897 am c6b2d297: am b96a9d92: Revert "fix 2233092 - Notification shade gets stuck half-open"
Merge commit 'c6b2d2970891790aa1c626a6f0d5ea39f5240161' into eclair-mr2-plus-aosp

* commit 'c6b2d2970891790aa1c626a6f0d5ea39f5240161':
  Revert "fix 2233092 - Notification shade gets stuck half-open"
2009-11-03 13:40:54 -08:00
Android Git Automerger
264863cb4b am a3f84bb2: am 6e8f47b0: Revert "Fix notification bar performance."
Merge commit 'a3f84bb2f434d507c866e3e8c52e0817c00da958' into eclair-mr2-plus-aosp

* commit 'a3f84bb2f434d507c866e3e8c52e0817c00da958':
  Revert "Fix notification bar performance."
2009-11-03 13:40:46 -08:00
Amith Yamasani
6179126dad Fix 2233444 (No IME).
Fix the flags for the StatusBarExpanded window that were causing the Window Manager to
think that it needed input.
2009-11-03 13:22:24 -08:00
Amith Yamasani
ed564b319d Revert "Revert "Fix notification bar performance.""
This reverts commit 6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de.
2009-11-03 13:20:21 -08:00
Amith Yamasani
dcdd29781a Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
This reverts commit b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5.
2009-11-03 13:18:03 -08:00
Android Git Automerger
d2801942a9 am b96a9d92: Revert "fix 2233092 - Notification shade gets stuck half-open"
Merge commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5' into eclair-plus-aosp

* commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5':
  Revert "fix 2233092 - Notification shade gets stuck half-open"
2009-11-03 12:36:15 -08:00
Android Git Automerger
8383d06fac am 6e8f47b0: Revert "Fix notification bar performance."
Merge commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de' into eclair-plus-aosp

* commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de':
  Revert "Fix notification bar performance."
2009-11-03 12:36:07 -08:00
Android Git Automerger
c6b2d29708 am b96a9d92: Revert "fix 2233092 - Notification shade gets stuck half-open"
Merge commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5' into eclair-mr2

* commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5':
  Revert "fix 2233092 - Notification shade gets stuck half-open"
2009-11-03 12:36:03 -08:00
Android Git Automerger
a3f84bb2f4 am 6e8f47b0: Revert "Fix notification bar performance."
Merge commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de' into eclair-mr2

* commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de':
  Revert "Fix notification bar performance."
2009-11-03 12:35:55 -08:00
Android Git Automerger
b96a9d9296 Revert "fix 2233092 - Notification shade gets stuck half-open"
As per Dr. No; revert commit 6a7899a8d6444989657d1058666269263b5b50c0.
2009-11-03 12:29:46 -08:00
Android Git Automerger
6e8f47b0ed Revert "Fix notification bar performance."
As per Dr. No; revert commit 0d7dc3b800d0489c43ad9071615b2b4ebec80443.
2009-11-03 12:26:15 -08:00
Mike Lockwood
44795bc2be am 0ce9c58f: am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
Merge commit '0ce9c58fe33a3b96219944762adbff99d12212a3' into eclair-mr2-plus-aosp

* commit '0ce9c58fe33a3b96219944762adbff99d12212a3':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 09:47:47 -08:00
Joe Onorato
5e2cd87f09 am 564fe1ba: am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
Merge commit '564fe1ba091f816f03cfae4dbdebcc7df22ae7f9' into eclair-mr2-plus-aosp

* commit '564fe1ba091f816f03cfae4dbdebcc7df22ae7f9':
  fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:47:39 -08:00
Mike Lockwood
0ce9c58fe3 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-mr2

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 09:37:50 -08:00
Mike Lockwood
3580ee41f1 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-plus-aosp

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 09:37:39 -08:00
Joe Onorato
564fe1ba09 am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
Merge commit '6a7899a8d6444989657d1058666269263b5b50c0' into eclair-mr2

* commit '6a7899a8d6444989657d1058666269263b5b50c0':
  fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:34:48 -08:00
Joe Onorato
179af55bd8 am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
Merge commit '6a7899a8d6444989657d1058666269263b5b50c0' into eclair-plus-aosp

* commit '6a7899a8d6444989657d1058666269263b5b50c0':
  fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:33:30 -08:00
Android (Google) Code Review
d2c6879436 Merge changes I116424c4,Ibd0ef67f into eclair
* changes:
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 12:32:04 -05:00
Joe Onorato
6a7899a8d6 fix 2233092 - Notification shade gets stuck half-open
Follow up to bug 2195678.  This was one of the reprocussions that
I was worried about with respect to that bug, so I'm counting
Dr. No on that change as the one for this one.
2009-11-03 12:22:33 -05:00
Mike Lockwood
f90ffcc639 Remove obsolete hardware auto-brightness support.
Change-Id: Ibd0ef67f887254f26ce19faf0627f8b246ec0a18
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 11:41:27 -05:00
Dan Egnor
96c178498c am cc1d35e2: am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2' into eclair-mr2-plus-aosp

* commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:10:33 -08:00
Dan Egnor
cc1d35e2e5 am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit 'afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-mr2

* commit 'afd81beb33cce3b296927d13821fe0dc874ce7db':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:05:04 -08:00
Dan Egnor
d0f054a5ed am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit 'afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-plus-aosp

* commit 'afd81beb33cce3b296927d13821fe0dc874ce7db':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:04:59 -08:00
Android (Google) Code Review
afd81beb33 Merge change Icbb3aa0a into eclair
* changes:
  Use setRepeating() rather than setInexactRepeating() for backup scheduling, and add some random fuzz to the scheduling times, to make sure we aren't creating hour-aligned server load spikes.
2009-11-02 16:58:26 -05:00
Joe Onorato
384b4b4efc am c13a9d05: am cce9f0fa: Merge change I0d7dc3b8 into eclair
Merge commit 'c13a9d0515f1a6e9dbe64f00e711eef4776aaef3' into eclair-mr2-plus-aosp

* commit 'c13a9d0515f1a6e9dbe64f00e711eef4776aaef3':
  Fix notification bar performance.
2009-11-02 13:43:30 -08:00
Joe Onorato
c13a9d0515 am cce9f0fa: Merge change I0d7dc3b8 into eclair
Merge commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3' into eclair-mr2

* commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3':
  Fix notification bar performance.
2009-11-02 13:38:13 -08:00
Joe Onorato
ac8d865866 am cce9f0fa: Merge change I0d7dc3b8 into eclair
Merge commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3' into eclair-plus-aosp

* commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3':
  Fix notification bar performance.
2009-11-02 13:37:41 -08:00
Android (Google) Code Review
cce9f0fa86 Merge change I0d7dc3b8 into eclair
* changes:
  Fix notification bar performance.
2009-11-02 16:29:31 -05:00
Joe Onorato
0d7dc3b800 Fix notification bar performance.
Bug 2195678

We had all this stuff there to keep the notification view
around so it doesn't need to be reconstructed each time,
and we weren't using it.  This fixes that, and it looks
much better now.
2009-11-02 16:20:44 -05:00
Mike Lockwood
a94da0e7d9 am e94261b8: am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit 'e94261b874b7d0704dade14540dbb9477a828163' into eclair-mr2-plus-aosp

* commit 'e94261b874b7d0704dade14540dbb9477a828163':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 12:01:32 -08:00
Mike Lockwood
b98837dc2d am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-plus-aosp

* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 11:49:00 -08:00
Mike Lockwood
e94261b874 am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2

* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 11:48:54 -08:00
Mike Lockwood
952211b4ae Fix problem with proximity sensor not reawaking screen if the values change too quickly.
The logic that disables user activity while turning off the screen should not affect proximity sensor.

Fixes bug b/2228734 (in-call, prox sensor gets confused)

Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-02 14:17:57 -05:00
Mike Lockwood
db61b03c23 am b2346324: am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp

* commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 11:04:41 -08:00
Mike Lockwood
b2346324e5 am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 10:11:17 -08:00
Mike Lockwood
29d03dd25d am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-plus-aosp

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 10:10:41 -08:00
Mike Lockwood
f1d14f6a33 Do not advance mLastEventTime when enabling or disabling user activity.
Fixes a race condition between the keyguard and power key that sometimes resulted
in the power key failing to turn off the screen.

Fixes bug b/2212852 (Power button does not put phone to sleep)

Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-02 11:56:59 -05:00
Mike Lockwood
69cbd29682 am f2055570: am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c' into eclair-mr2-plus-aosp

* commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 22:35:55 -08:00
Mike Lockwood
0fe19fb891 am f6fc4131: am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit 'f6fc41314d253962720b2c75f3a64025037acf0e' into eclair-mr2-plus-aosp

* commit 'f6fc41314d253962720b2c75f3a64025037acf0e':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 22:35:47 -08:00
Mike Lockwood
f20555706c am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2

* commit '9efd523c4611c0cf10e712453a699c083a01064c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 07:15:27 -08:00
Mike Lockwood
f6fc41314d am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2

* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 07:15:20 -08:00
Mike Lockwood
a0b0e720a1 am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-plus-aosp

* commit '9efd523c4611c0cf10e712453a699c083a01064c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 07:14:35 -08:00
Mike Lockwood
1cd948b427 am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-plus-aosp

* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 07:14:29 -08:00
Mike Lockwood
9efd523c46 Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Change-Id: I90eae78f71f377f6479d0aaf7ced38a7b988a7ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-01 10:05:50 -05:00
Mike Lockwood
47fd5cd1fa am 7dc642d0: am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp

* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:41:20 -08:00
Mike Lockwood
301eff069c am 148f666b: am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit '148f666b0a10183afc987809482f18d8199d747c' into eclair-mr2-plus-aosp

* commit '148f666b0a10183afc987809482f18d8199d747c':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 05:41:12 -08:00
Mike Lockwood
23fc31c793 am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-plus-aosp

* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:31:58 -08:00