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
Scott Main
32ef7ef6c8 am 947ce39e: Merge "docs: add landing for gcm" into jb-dev 
* commit '947ce39e5648851a5a49e71e22d187402ff1337d':
  docs: add landing for gcm
 2012-06-26 16:55:52 -07:00
Scott Main
947ce39e56 Merge "docs: add landing for gcm" into jb-dev 2012-06-26 16:53:44 -07:00
Joe Fernandez
bcfeefa094 am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 
* commit '3632af395c26951393f7e5289510c701c8d9f00b':
  docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
 2012-06-26 16:47:28 -07:00
Joe Fernandez
3e975309bf am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 
* commit '623898f099d8ab99f638fbd8062f3c227800fdf5':
  docs: GL Tracer, Device Monitor Tools for SDK r20
 2012-06-26 16:47:26 -07:00
Robert Ly
93b4fbef19 docs: add landing for gcm 
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
 2012-06-26 16:46:21 -07:00
Joe Fernandez
3632af395c Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 2012-06-26 16:45:31 -07:00
Joe Fernandez
623898f099 Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 2012-06-26 16:45:12 -07:00
Dianne Hackborn
2e8295ce18 am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 
* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
  Fix issue #6730064: When turning off Nakasi, it very often...
 2012-06-26 16:38:00 -07:00
Dianne Hackborn
3bb98aec93 Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 2012-06-26 16:36:36 -07:00
Joe Fernandez
3e820bee2b docs: GL Tracer, Device Monitor Tools for SDK r20 
Change-Id: Ib45210b88a7eb93e3bba4f7d535f344ccb054a72
 2012-06-26 16:27:18 -07:00
Katie McCormick
70585ac646 am eb2ab860: Merge "Doc update: Adding new GCM docs." into jb-dev 
* commit 'eb2ab860259af98f0f640dc10f1c5fce7a17cbc1':
  Doc update: Adding new GCM docs.
 2012-06-26 15:30:48 -07:00
Katie McCormick
eb2ab86025 Merge "Doc update: Adding new GCM docs." into jb-dev 2012-06-26 15:29:05 -07:00
Katie McCormick
76c6d86b5e Doc update: Adding new GCM docs. 
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
 2012-06-26 14:55:45 -07:00
Dianne Hackborn
ea401541c5 Fix issue #6730064: When turning off Nakasi, it very often... 
...turns itself immediately back on.

The ON_AFTER_RELEASE flag is documented to not turn the screen on if
it is currently off.

Unfortunately, it didn't seem to actually do this -- it would just
cause a userActivity() call, which turns on the screen if it is
currently off.

Fix this by adding yet another boolean to that function to tell it
to not poke user activity if the screen is off.  (Yes the number of
booleans on it is now insane, and should be cleaned up after we
get through JB.)

Bug: 6730064
Change-Id: I850dfbc777c7668d08b7d63f42a293e22b878256
 2012-06-26 14:44:08 -07:00
Joe Fernandez
719ff2c468 am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 
* commit 'fb4a0e452b81794884b95daa2121a9953ade4e36':
  docs: ADK 2012 documentation with AOA protocol docs
 2012-06-26 13:17:38 -07:00
Joe Fernandez
fb4a0e452b Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 2012-06-26 13:15:26 -07:00
Peter Ng
7b6698e7be am 3c6f8e4d: Merge "image typos in documents fix" into jb-dev 
* commit '3c6f8e4da0abc47b0d52e47edefa694bd81b8042':
  image typos in documents fix
 2012-06-26 13:14:25 -07:00
Gilles Debunne
034a57764b am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit 'f6656b80c203a2537aa30682f7e682a69e742e21':
  Reducing the contrast of text underline
 2012-06-26 13:14:23 -07:00
Peter Ng
3c6f8e4da0 Merge "image typos in documents fix" into jb-dev 2012-06-26 13:12:45 -07:00
Gilles Debunne
f6656b80c2 Merge "Reducing the contrast of text underline" into jb-dev 2012-06-26 13:12:07 -07:00
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
Peter Ng
c36b8655b9 image typos in documents fix 
Change-Id: I357ff2d99bc2dff9ac27cfd6d1e97afb35740dbc
 2012-06-26 11:18:29 -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
Joe Fernandez
3a77ccc63f docs: ADK 2012 documentation with AOA protocol docs 
Change-Id: Ife96b3ffa890d42fc97125b30bdd389448645562
 2012-06-26 02:24:32 -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
Joe Fernandez
f86f0e68c6 docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1 
Change-Id: I37ac2387b1fcc6a321f5c8edc44abe834a01762d
 2012-06-25 16:51:42 -07:00
Gilles Debunne
fca8947f49 Reducing the contrast of text underline 
Alpha set to 50%.

Bug: 6712694
Change-Id: Ic292b6e24a97426e835fa379b1fd60d3b7912e99
 2012-06-25 16:42:51 -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