Eric Olsen
e772eb7af0
am 62335430: Merge change I4499ad72 into eclair
...
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2
* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
Fix bad merge fixes build breakage.
2009-11-04 17:36:59 -08:00
Eric Olsen
8e49e998fd
am 62335430: Merge change I4499ad72 into eclair
...
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp
* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
Fix bad merge fixes build breakage.
2009-11-04 17:36:26 -08:00
Android (Google) Code Review
62335430b0
Merge change I4499ad72 into eclair
...
* changes:
Fix bad merge fixes build breakage.
2009-11-04 20:27:11 -05:00
Eric Olsen
4499ad729a
Fix bad merge fixes build breakage.
...
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 17:12:41 -08:00
Eric Olsen
122f412a01
am 76922b83: am 9053fdb3: Merge change I76127f6f into eclair
...
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp
* commit '76922b8378f235e79fd861ba846bed833199e59f':
Add support for colored LED on jogball backlight.
2009-11-04 16:54:29 -08:00
Eric Olsen
76922b8378
am 9053fdb3: Merge change I76127f6f into eclair
...
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
2009-11-04 16:49:31 -08:00
Eric Olsen
5a301c0d17
am 9053fdb3: Merge change I76127f6f into eclair
...
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp
* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
2009-11-04 16:46:49 -08:00
Christopher Tate
9d45108a5f
am 888b702c: am 595596fe: Merge change I561011bc into eclair
...
Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp
* commit '888b702c81b21847b19c4e2845686ed35cc03a0e':
Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:42:10 -08:00
Android (Google) Code Review
9053fdb32b
Merge change I76127f6f into eclair
...
* changes:
Add support for colored LED on jogball backlight.
2009-11-04 19:39:29 -05:00
Christopher Tate
888b702c81
am 595596fe: Merge change I561011bc into eclair
...
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2
* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:35:06 -08:00
Christopher Tate
409d10c30c
am 595596fe: Merge change I561011bc into eclair
...
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-plus-aosp
* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:02:06 -08:00
Eric Olsen
f42f15cf45
Add support for colored LED on jogball backlight.
...
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 14:31:26 -08:00
Christopher Tate
78dd4a7371
Fix #2176803 - restores from userdebug to user builds not working
...
The underlying issue is that ordinarily, the restore mechanism checks the
signature block of the package which uploaded the restore data against the
signature of the package on-device that will be handling the restore. This is
to ensure that the restore goes to the "same" application as the one that
uploaded it.
However, applications bundled on the system partition as part of the device
build are signed not with a permanent, app-identifying signature, but rather
with the device's signature block, which is different for each kind of device
and potentially between kinds of build for the same device. That renders the
stored backup data unusable when changing devices / builds / etc.
This change works around the problem by explicitly privileging applications that
reside on the system partition: they have been built into the device, and so
are trusted to be able to handle data that is marked as coming from its package
name.
Change-Id: I561011bce2b54cff3e695e82e7544b126b6ac31e
2009-11-04 13:27:56 -08:00
Mike Lockwood
7efae9ae50
am 6de8bbb0: am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
...
Merge commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422' into eclair-mr2-plus-aosp
* commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422':
PowerManagerService: Fix manual brightness mode.
2009-11-04 06:19:50 -08:00
Mike Lockwood
b8d8bb40a1
am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
...
Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-plus-aosp
* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
PowerManagerService: Fix manual brightness mode.
2009-11-04 06:11:15 -08:00
Mike Lockwood
6de8bbb00a
am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
...
Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2
* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
PowerManagerService: Fix manual brightness mode.
2009-11-04 06:10:37 -08:00
Mike Lockwood
27c6dd7aa4
PowerManagerService: Fix manual brightness mode.
...
Change-Id: I10aec64e3f7ae2715475b9797565747295c19a00
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-04 08:57:07 -05:00
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