Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,510 Commits 3 Branches 0 Tags
dcf4eeb0363399279c1905eaffb825dc722301b4
Commit Graph

79510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
dcf4eeb036 am 95bb4099: Merge "docs: rs api docs" into jb-dev 
* commit '95bb409981496b23448f02df34faaf384ca28a9f':
  docs: rs api docs
 2012-06-26 12:15:26 -07:00
Robert Ly
95bb409981 Merge "docs: rs api docs" into jb-dev 2012-06-26 12:14:04 -07:00
Robert Ly
fd73b5844c docs: rs api docs 
Change-Id: Ib2f1ae1ba47118242d4a52b943f5eba26714aa1f
 2012-06-26 12:07:13 -07:00
Kenny Root
7d33d0c36c am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev 
* commit 'c17f92ce047e8d62fac829d1df5dae654f7e4de8':
  Use removePackageLI instead of removing mPackages
 2012-06-26 10:36:54 -07:00
Kenny Root
c17f92ce04 Merge "Use removePackageLI instead of removing mPackages" into jb-dev 2012-06-26 10:34:44 -07:00
John Spurlock
59bd7c2f4e am 64b7a3e9: Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 
* commit '64b7a3e99526550aacd95f1dbd35487df7375ac6':
  TabletStatusBar: Lights-out shadow view should be taller
 2012-06-26 09:57:47 -07:00
John Spurlock
64b7a3e995 Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 2012-06-26 09:55:53 -07:00
The Android Open Source Project
51d33db0f1 Reconcile with jb-release 
Change-Id: I93b16393c39020ad35743106f8c44970b69b1dfa
 2012-06-26 07:18:21 -07:00
Scott Main
d1ae2d715e am e066fd3c: Merge "docs: move NDK into Download section" into jb-dev 
* commit 'e066fd3c9b2270e182eb87be8efb1d5c4aee60e2':
  docs: move NDK into Download section
 2012-06-25 21:20:02 -07:00
Scott Main
e066fd3c9b Merge "docs: move NDK into Download section" into jb-dev 2012-06-25 21:17:49 -07:00
Nick Kralevich
3346bc6949 am ab294eeb: Merge "DevicePolicyManagerService: dump less" into jb-dev 
* commit 'ab294eeb20d884855b038600f94a6e17b88b5772':
  DevicePolicyManagerService: dump less
 2012-06-25 18:46:12 -07:00
Nick Kralevich
ab294eeb20 Merge "DevicePolicyManagerService: dump less" into jb-dev 2012-06-25 18:43:56 -07:00
Nick Kralevich
be00b41014 DevicePolicyManagerService: dump less 
Reduce the amount of unnecessary information emitted from
the DevicePolicyManagerService.

Bug: 6732364
Change-Id: I639f6beab8471bdbe41ce6cd3a5a378acaf678b2
 2012-06-25 17:39:12 -07:00
Dianne Hackborn
e53fd84a28 am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev 
* commit '9e608c12186d308fb1711e8824901fdf931a3a96':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.
 2012-06-25 17:37:17 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
 2012-06-25 17:37:15 -07:00
Dianne Hackborn
b4215267f3 am fca66cd8: Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev 
* commit 'fca66cd828e214fe7494e46c7daa2879dfc3210d':
  DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses
 2012-06-25 17:37:13 -07:00
Dianne Hackborn
9e608c1218 Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev 2012-06-25 17:35:49 -07:00
Dianne Hackborn
17990395bc Merge "Fix issue #6717667: expanded notification actions don't work on the lock screen" into jb-dev 2012-06-25 17:35:36 -07:00
Dianne Hackborn
fca66cd828 Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev 2012-06-25 17:35:21 -07:00
The Android Automerger
87c0947ad6 merge in jb-release history after reset to jb-dev 2012-06-25 17:17:46 -07:00
Svetoslav Ganov
4844fccc79 am 5d88c14c: Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev 
* commit '5d88c14cd39d1100e28f7e340874655ab7a42904':
  Ensure screen reader URL gets updated during ICS to JB update.
 2012-06-25 17:11:12 -07:00
Svetoslav Ganov
5d88c14cd3 Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev 2012-06-25 17:09:24 -07:00
Kenny Root
eca64b3914 Use removePackageLI instead of removing mPackages 
When adding an system app via OTA, trying to remove it from mPackages
directly doesn't work. The ContentProviders and other things aren't
removed and point to the hidden system app's applicationInfo instead of
the updated app.

Bug: 6685263
Change-Id: I487cf518e0e3c60fae736e9b974617023a7dee8d
 2012-06-25 16:39:45 -07:00
Joe Fernandez
fb739ae749 am fcd7cf2a: Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev 
* commit 'fcd7cf2a24eaff85085fde58dc8c69f8ff374575':
  cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f
 2012-06-25 16:00:43 -07:00
Joe Fernandez
fcd7cf2a24 Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev 2012-06-25 15:58:47 -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
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