Michael Jurka
85a2d7f94e
am c4d7721c: am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev
...
* commit 'c4d7721cb08cc797ea592f54797135f372689f6a':
Update documentation on max widget bitmap usage
2012-06-25 15:31:25 -07:00
Jeff Brown
ad51a1e923
am 0086ec0d: am d48cf0c0: Merge "Don\'t wait until boot timeout if there is no wallpaper." into jb-dev
...
* commit '0086ec0d3009bc8c80e1330cd73ba534aa45f489':
Don't wait until boot timeout if there is no wallpaper.
2012-06-25 15:31:23 -07:00
Jeff Brown
c585841115
am db65cc52: am a3a59a2f: Merge "Don\'t enable input dispatch until display enabled." into jb-dev
...
* commit 'db65cc520ebb3f9cfafa4a9d5be9f07621814213':
Don't enable input dispatch until display enabled.
2012-06-25 15:31:19 -07:00
Michael Jurka
c4d7721cb0
am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev
...
* commit '806a360275b3963d1941130ca2998a8abd76126f':
Update documentation on max widget bitmap usage
2012-06-25 15:28:48 -07:00
Jeff Brown
0086ec0d30
am d48cf0c0: Merge "Don\'t wait until boot timeout if there is no wallpaper." into jb-dev
...
* commit 'd48cf0c0ce5f9458802d2be8671c85fa027a74a0':
Don't wait until boot timeout if there is no wallpaper.
2012-06-25 15:28:46 -07:00
Jeff Brown
db65cc520e
am a3a59a2f: Merge "Don\'t enable input dispatch until display enabled." into jb-dev
...
* commit 'a3a59a2fa7e3b3b044b41d2741118be37c57509a':
Don't enable input dispatch until display enabled.
2012-06-25 15:28:44 -07:00
Michael Jurka
806a360275
Merge "Update documentation on max widget bitmap usage" into jb-dev
2012-06-25 15:26:48 -07:00
Jeff Brown
d48cf0c0ce
Merge "Don't wait until boot timeout if there is no wallpaper." into jb-dev
2012-06-25 15:26:19 -07:00
Jeff Brown
a3a59a2fa7
Merge "Don't enable input dispatch until display enabled." into jb-dev
2012-06-25 15:26:14 -07:00
Raph Levien
3b00fc2eca
Merge "Fix broken build when DEBUG_GLYPHS is set"
2012-06-25 15:18:45 -07:00
Michael Jurka
f25ab44975
Update documentation on max widget bitmap usage
...
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
2012-06-25 15:11:21 -07:00
John Spurlock
9ac704fe1c
am 4415838b: am b032f9fc: Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
...
* commit '4415838b4b7014cee4a4bd1bfaeafa39d177a503':
TabletStatusBar: Hide notifications during Setup Wizard
2012-06-25 15:03:28 -07:00
John Spurlock
4415838b4b
am b032f9fc: Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
...
* commit 'b032f9fc9d32ff4e73f8323573ca2c5e427e7a74':
TabletStatusBar: Hide notifications during Setup Wizard
2012-06-25 15:00:50 -07:00
John Spurlock
b032f9fc9d
Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
2012-06-25 14:58:22 -07:00
Andreas Huber
7b10a492bc
am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
...
* commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e':
Document some of the more common mimetypes to be used when instantiating
2012-06-25 14:56:06 -07:00
Andreas Huber
6dfd6aec27
am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
...
* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
Document some of the more common mimetypes to be used when instantiating
2012-06-25 14:53:07 -07:00
Andreas Huber
c8c5e98b9e
Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
2012-06-25 14:50:53 -07:00
Andreas Huber
68b1a6eed8
Document some of the more common mimetypes to be used when instantiating
...
MediaCodec components.
Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
2012-06-25 14:38:16 -07:00
Raph Levien
6212a4f2ed
Fix broken build when DEBUG_GLYPHS is set
...
Some of the logging lines referred to the "path" variable which no
longer exists. We log the Harfbuzz script instead, which hopefully
provides enough context.
This change only affects debug builds, but we will want to be working
intensively in this space.
Change-Id: I86c3b58c9fa2a8c47812ef5f0b5ce64fd8dcdc20
2012-06-25 14:29:52 -07:00
Dianne Hackborn
9da6958084
am 1520e9ae: am 612ca9c6: (-s ours) Merge "Fix shutdown sequence to avoid SIGSEGV when running am command"
...
* commit '1520e9aeea89790738a746bbf0ac7689e5296ef2':
Fix shutdown sequence to avoid SIGSEGV when running am command
2012-06-25 14:09:33 -07:00
Dianne Hackborn
1520e9aeea
am 612ca9c6: (-s ours) Merge "Fix shutdown sequence to avoid SIGSEGV when running am command"
...
* commit '612ca9c6a55bd932c45f5b85ae932a1b712dd914':
Fix shutdown sequence to avoid SIGSEGV when running am command
2012-06-25 14:05:55 -07:00
Scott Main
f20a2a8af8
am 451f0341: am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
...
* commit '451f0341445e8a05933d2fc2d6ec2b1aa3683602':
docs: clean up javadoc code snippets, unescaped entities
2012-06-25 12:37:09 -07:00
Scott Main
451f034144
am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
...
* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
docs: clean up javadoc code snippets, unescaped entities
2012-06-25 12:33:55 -07:00
Scott Main
e9b4b3e94d
Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
2012-06-25 12:31:11 -07:00
Scott Main
c436c17c9d
am 82e25bd5: am dccd66f5: Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that\'s still relevant to some services" into jb-dev
...
* commit '82e25bd59deedb4c17514e1e724b8baca5ea7f14':
docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services
2012-06-25 12:02:49 -07:00
Scott Main
82e25bd59d
am dccd66f5: Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that\'s still relevant to some services" into jb-dev
...
* commit 'dccd66f5681c1372494da635b70242a7d535debc':
docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services
2012-06-25 12:00:06 -07:00
Scott Main
dccd66f568
Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services" into jb-dev
2012-06-25 11:57:09 -07:00
Scott Main
8ce79cc87a
docs: return the sdk terms doc to the site. needs to be revised,
...
but for now offers some info that's still relevant to some services
Change-Id: I689171ab81b7c47334d8dfa738be80e7eca4581a
2012-06-25 11:55:20 -07:00
Craig Mautner
5af65850ea
Merge "Eliminate jank by setting force hiding differently"
2012-06-25 11:43:43 -07:00
Eric Fischer
a346695a20
am 764d1368: (-s ours) am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '764d1368d6b137e0c99ce9e7b326dc7fe25aba05':
Import translations. DO NOT MERGE
2012-06-25 11:38:31 -07:00
Eric Fischer
764d1368d6
am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
Import translations. DO NOT MERGE
2012-06-25 11:34:58 -07:00
Eric Fischer
a3b6554c31
Merge "Import translations. DO NOT MERGE"
2012-06-25 11:33:00 -07:00
Eric Fischer
c5fc8f5c1b
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-25 11:32:30 -07:00
Eric Fischer
6135e52e82
Import translations. DO NOT MERGE
...
Change-Id: Ia19fe79fc797b8048b90a6d074b1117c2e362c8f
2012-06-25 11:32:05 -07:00
Scott Main
97e0a1c6f3
docs: clean up javadoc code snippets, unescaped entities
...
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
2012-06-25 11:25:20 -07:00
Eric Fischer
d7e646d6d7
Import translations. DO NOT MERGE
...
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
2012-06-25 11:24:00 -07:00
Craig Mautner
f12100e025
Eliminate jank by setting force hiding differently
...
Only force hide windows when the keyguard is animating in.
Fixes bug 6721572.
Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba
2012-06-25 11:13:24 -07:00
Scott Main
5e61f9275c
am 2965b93d: am e40c4636: docs: move AIDL doc under Services in api guides.
...
* commit '2965b93d5e3d4b8563352034ee7371f9b99ff225':
docs: move AIDL doc under Services in api guides.
2012-06-25 10:48:42 -07:00
Scott Main
2965b93d5e
am e40c4636: docs: move AIDL doc under Services in api guides.
...
* commit 'e40c4636d970c50f7719e7d5067963be93c25750':
docs: move AIDL doc under Services in api guides.
2012-06-25 10:45:50 -07:00
Scott Main
e40c4636d9
docs: move AIDL doc under Services in api guides.
...
Change-Id: I525de97958e2093af15cce2b007ec022cb315a71
2012-06-25 10:02:13 -07:00
Glenn Kasten
4f967c2fd7
Merge "Remove AudioRecord record_flags"
2012-06-25 08:35:56 -07:00
The Android Open Source Project
054c039d41
am 95dca885: Reconcile with jb-release
...
* commit '95dca885cf5a88a4ee34a21e3bca4e152fff7f6c':
2012-06-25 08:02:58 -07:00
The Android Open Source Project
95dca885cf
Reconcile with jb-release
...
Change-Id: I3dcf46b82ece74242207e8e3769a87dbe8f85a5f
2012-06-25 07:57:16 -07:00
John Spurlock
3623128d13
TabletStatusBar: Hide notifications during Setup Wizard
...
Protect tablet users going through the initial setup wizard from trapping
themselves in Settings before the setup wizard is complete. A similar change
was already made for phones, so use the same logic.
Also hide quick-settings button (another way to get trapped in Settings) and
associated panel click handler. Remove clear button since we're no longer
showing notification items.
Bug: 6704080
Change-Id: If7148cde9d18f493627f8367fd4b39d22e0d5ef1
2012-06-25 09:52:38 -04:00
Adam Powell
c497bc69e9
am 3c419da6: am dbbfa702: Fix MediaRouter bugs
...
* commit '3c419da632c7f332a50e5001331544cb8c919dce':
Fix MediaRouter bugs
2012-06-24 14:59:03 -07:00
Adam Powell
3c419da632
am dbbfa702: Fix MediaRouter bugs
...
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
Fix MediaRouter bugs
2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0
Fix MediaRouter bugs
...
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.
Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.
Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
2012-06-24 14:32:04 -07:00
Jeff Brown
780c46fc91
Don't wait until boot timeout if there is no wallpaper.
...
When launching only core apps, the wallpaper service
is not started. Without this change the WM waits
up to 30 seconds for the wallpaper window to be created even
though it will never happen. This introduces a significant
delay before the boot animation is dismissed so the user can
enter a decryption password.
Bug: 6263070
Change-Id: Ia975127a0bf09cf99818f7cc4fd6c0264b740ec6
2012-06-24 13:51:41 -07:00
Jeff Brown
08a746a0c6
Don't enable input dispatch until display enabled.
...
Bug: 6263070
Change-Id: I05d036fc1d9ec06d164d6743d45bb3f199cfab47
2012-06-24 12:23:58 -07:00
The Android Automerger
1e9aef5d94
merge in jb-release history after reset to jb-dev
2012-06-23 23:22:21 -07:00