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

108984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
db550fc900 am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 
* commit '0e545bf5502fde4fe2c96377829bd4c3f7c2d727':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
 2013-07-08 12:40:28 -07:00
Jean-Baptiste Queru
0e545bf550 am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 
* commit '9775203b610267bf8cecaf7c00db68b73b529ced':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
 2013-07-08 12:37:27 -07:00
Jean-Baptiste Queru
9775203b61 Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 2013-07-08 19:35:36 +00:00
Jean-Baptiste Queru
619682dfae am 58d52298: am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers." 
* commit '58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5':
  Set foreground priority for shutdown receivers.
 2013-07-08 12:22:59 -07:00
Chris Craik
5bee57567b Merge "Use global references for Bitmap AndroidPixelRefs" 2013-07-08 19:20:18 +00:00
Jean-Baptiste Queru
58d52298be am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers." 
* commit '57512008e2f9f1f04ff5a11b522533c753ed36fe':
  Set foreground priority for shutdown receivers.
 2013-07-08 12:20:15 -07:00
Jean-Baptiste Queru
57512008e2 am 8f793103: Merge "Set foreground priority for shutdown receivers." 
* commit '8f793103d81e988e2ef25ecdfde1b279e299a97e':
  Set foreground priority for shutdown receivers.
 2013-07-08 12:15:30 -07:00
Jean-Baptiste Queru
8f793103d8 Merge "Set foreground priority for shutdown receivers." 2013-07-08 19:01:26 +00:00
Craig Mautner
785a22188f Merge "Move mLaunchingActivity from stack to supervisor." 2013-07-08 18:46:05 +00:00
Jean-Baptiste Queru
c6376b54ba am a998fa2d: am e14afe71: am 58f26e9d: Merge "The order of child windows is switched" 
* commit 'a998fa2df957ad3f1c860d5ab8903041cf53a2f0':
  The order of child windows is switched
 2013-07-08 11:27:51 -07:00
Jean-Baptiste Queru
a998fa2df9 am e14afe71: am 58f26e9d: Merge "The order of child windows is switched" 
* commit 'e14afe7163a9d25c4d06e40165051f5c2d4d540a':
  The order of child windows is switched
 2013-07-08 11:25:44 -07:00
Jean-Baptiste Queru
e14afe7163 am 58f26e9d: Merge "The order of child windows is switched" 
* commit '58f26e9dfbd3986037fa5e52e8def1cb6b741bc3':
  The order of child windows is switched
 2013-07-08 11:21:52 -07:00
Jean-Baptiste Queru
58f26e9dfb Merge "The order of child windows is switched" 2013-07-08 18:18:13 +00:00
takeda.masayuki
1873509153 The order of child windows is switched 
By calling WindowManagerService#reAddWindowLocked(), the window object
in DisplayContent.mWindows is rearranged. If this window has children,
the window objects belonging to WindowState.mChildWindows are also
rearranged together. At this time, while DisplayContent.mWindows is
arranged in ascending order of Z-Order, WindowState.mChildWindows is
arranged in descending order. Therefore, if children
(= WindowState.mChildWindows) are added to DisplayContent.mWindows
in the original order, the order of children is switched. I think
that children must be sorted before they are added.

Change-Id: I28a506f17fcd99c801a3faa17cca66fffb291596
 2013-07-08 11:08:41 -07:00
Chris Craik
0c20c3898a Use global references for Bitmap AndroidPixelRefs 
bug:9621717

Because we're no longer holding onto Bitmaps Java side during
DisplayList lifetime, use global refs to keep the backing byte arrays
around.

Adds back bitmap buffer passing + native ref management removed by
3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9

Adds back globalRef-ing removed by
f890fab5a6715548e520a6f010a3bfe7607ce56e

Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
 2013-07-08 11:08:02 -07:00
Scott Main
4a9095007d am 4e4cb74f: am c5825c83: am 0f4ef70c: am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8 
* commit '4e4cb74f2e8ee3c45fec4283f020d1f727832dac':
  dashboard update for 7/8
 2013-07-08 11:07:58 -07:00
Scott Main
4e4cb74f2e am c5825c83: am 0f4ef70c: am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8 
* commit 'c5825c834faa5edefc2c9b430932b83f1c9145e7':
  dashboard update for 7/8
 2013-07-08 11:06:08 -07:00
Scott Main
c5825c834f am 0f4ef70c: am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8 
* commit '0f4ef70c05c1e24b6a014eb30f22aef74b38a9ee':
  dashboard update for 7/8
 2013-07-08 11:04:39 -07:00
Scott Main
0f4ef70c05 am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8 
* commit '637c15dfffd3a75998f7dbf2061b249d026b9eb1':
  dashboard update for 7/8
 2013-07-08 11:02:37 -07:00
Jean-Baptiste Queru
0a8949ddbe am 869699cd: am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]." 
* commit '869699cd6e8375cc94115b507f9449efb3a5bc16':
  Mixed delete/delete[].
 2013-07-08 11:00:57 -07:00
Scott Main
637c15dfff am 98dc0c44: am 31da6322: dashboard update for 7/8 
* commit '98dc0c447fe2f71dbac16343a63203052e99cee1':
  dashboard update for 7/8
 2013-07-08 11:00:04 -07:00
Jean-Baptiste Queru
869699cd6e am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]." 
* commit '228186809a25a870c10ed1c8e77ff9623127d304':
  Mixed delete/delete[].
 2013-07-08 10:58:24 -07:00
Scott Main
98dc0c447f am 31da6322: dashboard update for 7/8 
* commit '31da63220f1038b65d094bf510cd22f6a6da9769':
  dashboard update for 7/8
 2013-07-08 10:57:29 -07:00
Jean-Baptiste Queru
228186809a am a4854d39: (-s ours) Merge "Mixed delete/delete[]." 
* commit 'a4854d39ae6e03d6b9430bfdef85ecb7505e0139':
  Mixed delete/delete[].
 2013-07-08 10:55:20 -07:00
Ying Wang
fb236b56d2 Fix build. 
Change-Id: I2348e75e95581b1e5acf1c52b83948e46547a19e
 2013-07-08 10:53:58 -07:00
Jean-Baptiste Queru
a4854d39ae Merge "Mixed delete/delete[]." 2013-07-08 17:51:24 +00:00
Scott Main
31da63220f dashboard update for 7/8 
Change-Id: I4935d5544754bbbd1ceb3d535ad5cb9a5dbe2453
 2013-07-08 10:49:00 -07:00
Joe Malin
c7d69aacc9 am 693f59a3: am b62bdd86: am 61754145: am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '693f59a373c7976f53a0941ba7307dbbae72b357':
  DOC: Sync Adapters Android Training
 2013-07-08 10:35:15 -07:00
Joe Malin
693f59a373 am b62bdd86: am 61754145: am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit 'b62bdd862f8c6be5879a10400c8156057324469c':
  DOC: Sync Adapters Android Training
 2013-07-08 10:32:22 -07:00
Joe Malin
b62bdd862f am 61754145: am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '61754145f4a6e897963ebbb73157b5ee039ec247':
  DOC: Sync Adapters Android Training
 2013-07-08 10:30:12 -07:00
Joe Malin
61754145f4 am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '07797c45dea5bcdf4c21ee7a30e02af98a2d8ed8':
  DOC: Sync Adapters Android Training
 2013-07-08 10:27:25 -07:00
Joe Malin
07797c45de am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '5c27ec22133cbea536283c971857759e9e7188ba':
  DOC: Sync Adapters Android Training
 2013-07-08 10:24:48 -07:00
Joe Malin
5c27ec2213 am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit 'c7d3d28b67ee038e6cb2b7a7ad80ea4a8fd3acdd':
  DOC: Sync Adapters Android Training
 2013-07-08 10:22:00 -07:00
Joe Malin
c7d3d28b67 am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '8b3c7d0c8fec82a6ad32abcb7e78416d8513512d':
  DOC: Sync Adapters Android Training
 2013-07-08 10:19:25 -07:00
Joe Malin
8b3c7d0c8f am c355a1c1: DOC: Sync Adapters Android Training 
* commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5':
  DOC: Sync Adapters Android Training
 2013-07-08 10:17:08 -07:00
Elliott Hughes
6295aac184 am 269d3722: am 86aa1953: am 2a26547f: Merge "Track libcore API update." 
* commit '269d3722762c74a766b9c3200a25832ba8307aa9':
  Track libcore API update.
 2013-07-08 10:06:20 -07:00
Elliott Hughes
269d372276 am 86aa1953: am 2a26547f: Merge "Track libcore API update." 
* commit '86aa19532896dc6ede04d53ee96708becde9b0dc':
  Track libcore API update.
 2013-07-08 10:03:48 -07:00
Elliott Hughes
86aa195328 am 2a26547f: Merge "Track libcore API update." 
* commit '2a26547fd391c8038ad9f57fcb51d62fba0ee543':
  Track libcore API update.
 2013-07-08 10:01:17 -07:00
Elliott Hughes
2a26547fd3 Merge "Track libcore API update." 2013-07-08 16:58:47 +00:00
Elliott Hughes
2ecdbc5395 Track libcore API update. 
Bug: 3484927
Change-Id: Icd8a45d33efd205a5eb21ac6a4fcf781f8b5e064
 2013-07-08 09:41:06 -07:00
Kenny Root
9a995f57a3 KeySetManager: change KEYSET_NOT_FOUND to public 
Make the constant KEYSET_NOT_FOUND so that other source code components
can use that as the sentinel value directly instead of -1

Change-Id: If89de5fb312d55e360b96aadbc6effcd480043b2
 2013-07-08 09:37:24 -07:00
Kenny Root
2758e291c8 KeySetManager: fix indentation 
Change-Id: I4fe67143bce30a7592c6a0f5a094172112bdfe43
 2013-07-08 09:37:24 -07:00
Kenny Root
978263ee49 Merge "KeySetManager: add keyset aliases to dump" 2013-07-08 16:23:02 +00:00
The Android Automerger
e8fd900070 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-08 05:55:31 -07:00
Craig Mautner
7ea5bd497f Move mLaunchingActivity from stack to supervisor. 
There did not need to be one launching wakelock for each stack.
Moving it to the stack supervisor makes the logic much simpler
and fixes bug 9693439.

Change-Id: I5c9ae856540170a4d66fedb74becb6959c44dd8f
 2013-07-05 15:27:08 -07:00
Ken Wakasa
02a44f7d47 Revert "Stop marking gamepads as keyboards" 
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.

Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
 2013-07-05 04:08:36 +00:00
Eric Laurent
38b2322567 Merge "Headphones volume warning disabled by default" 2013-07-04 01:05:37 +00:00
Eric Laurent
7cf06209dc Headphones volume warning disabled by default 
Enable headphone volume limitation explicitely for
countries where EN60950 is applicable.

Bug: 8877359.

Change-Id: Ida9e6678ee451350b826492f0085726003f0d39d
 2013-07-03 17:59:03 -07:00
Dianne Hackborn
cee04b5739 Add traces for app launch / fully drawn times. 
Note that we don't know the fully drawn time unless the app
tells it has finished drawing, so for apps that don't do this
we will end up just continuing to consider it to be drawing until
the next app is launched.

Change-Id: I766b71cf61b8d7324ccf239b7a44bef2518e2454
 2013-07-03 17:06:08 -07:00
msg555
b264f5f83f Mixed delete/delete[]. 
Error found via valgrind.
 2013-07-03 19:26:23 -04:00