drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,534 Commits 1 Branch 0 Tags
Commit Graph

79534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ian Ni-Lewis
9ea1be201f cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f 
Change-Id: I894d4f7b265dbbc2792207e7955453dcf27472d6
 2012-06-25 15:22:23 -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
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
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
Dianne Hackborn
1927ae8a56 Fix issue #6717667: expanded notification actions don't work on the lock screen 
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
 2012-06-25 14:28:48 -07:00
Dianne Hackborn
42e620caf0 Fix issue #6381224: Initial emulator boot fails and shows a blank black screen. 
Make sure that all cases where we remove an activity from the history
stack, we call resumeTopActivityLocked() to cause the home activity
to be launched if the stack is now empty.

Also fixed a problem where some timeouts would not be removed when destroying
an activity, and a race condition in boot that would cause the
PhoneWindowManager to initially start out with the home key not working.

Bug: 6381224
Change-Id: If046bb01aed624b0d9ee3bbaaba68ed6b98fd1d0
 2012-06-25 14:27:41 -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
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
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
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
c5fc8f5c1b Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-25 11:32:30 -07:00
John Spurlock
988e6b7b13 TabletStatusBar: Lights-out shadow view should be taller 
The lights-out shadow view is now the same height as the system bar.
This makes for a better looking animation (no cropping) and positions
the dots in the right place.

Bug: 6722791
Change-Id: Ifc2cc1586cd72a81a7bb801442be4fa4e03da2a5
 2012-06-25 14:32:05 -04: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
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
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
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
Scott Main
1e546247b5 am 40a0376e: docs: remove unused id attribute from Button 
* commit '40a0376ea5ac597d8df04fd3e4ad8bde7ac7c9ec':
  docs: remove unused id attribute from Button
 2012-06-23 17:02:40 -07:00
Scott Main
40a0376ea5 docs: remove unused id attribute from Button 
Change-Id: Ia61c418972699d40757923fd69ea27b26eddaa05
 2012-06-23 16:42:33 -07:00
Scott Main
0c51198806 am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
  eat comment so it doesn't appear in docs
 2012-06-23 12:46:23 -07:00
Scott Main
b0efc7fce7 eat comment so it doesn't appear in docs 
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
 2012-06-23 12:36:17 -07:00
Dianne Hackborn
612ca9c6a5 Merge "Fix shutdown sequence to avoid SIGSEGV when running am command" 2012-06-23 12:03:51 -07:00
Scott Main
39aa4bbb98 am 067d64a9: docs: fix broken link 
* commit '067d64a99a2ee90f250d81ee36d5a3efa056e5b5':
  docs: fix broken link
 2012-06-23 11:31:17 -07:00
Scott Main
067d64a99a docs: fix broken link 
Change-Id: Ia4ccab838e36b6e0e9298ed7222b5a581d3d5234
 2012-06-23 11:27:20 -07:00
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">"" 
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
 2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">"" 
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
 2012-06-23 07:12:16 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
 2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
5f77f82e60 Merge "Another case of extra ">"" 2012-06-23 05:59:11 -07:00
Jean-Baptiste Queru
b8b47c22c8 Merge "Remove redundant ">"" 2012-06-23 05:58:56 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Scott Main
0e61a72684 am 6f3e5e03: docs: remove ICS from developer hompage 
* commit '6f3e5e03cf0affcf7d8761fe2ab58b8a1e91d177':
  docs: remove ICS from developer hompage
 2012-06-23 05:37:03 -07:00
Scott Main
9b7596e1cc am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 
* commit '4708d8f54bc8908c158b8d6f591f9c132e572417':
  docs: add jelly bean to homepage
 2012-06-23 05:37:00 -07:00
Adam Powell
56fbd14f3d am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '1b4ea7eff50545f4673ca01b664e5edccc784688':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:36:58 -07:00