106299 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
7e683ec6a5 am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit 'fa42e774bc48c3172023c8c49610baa469c19e39':
  FastScroller: Fix to use appropriate index
2013-07-08 14:28:45 -07:00
Jean-Baptiste Queru
b8b94d9bb1 am 538bd4d8: Merge "Fixing missing internal link in document."
* commit '538bd4d8f2ff80d33e26f951c834c8d3680b8420':
  Fixing missing internal link in document.
2013-07-08 14:25:10 -07:00
Jean-Baptiste Queru
65ba6d11e1 am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '1e7276ce35f68c2df10b52c8adf8adc2882b8671':
  Fix typo in AlertController.java
2013-07-08 14:25:06 -07:00
Jean-Baptiste Queru
fa42e774bc Merge "FastScroller: Fix to use appropriate index" 2013-07-08 21:24:06 +00:00
Jean-Baptiste Queru
538bd4d8f2 Merge "Fixing missing internal link in document." 2013-07-08 21:22:37 +00:00
Jean-Baptiste Queru
1e7276ce35 Merge "Fix typo in AlertController.java" 2013-07-08 21:22:18 +00:00
Jean-Baptiste Queru
7dfcae9bae am d8694667: am ae6bdf63: Merge "Add Colemak keyboard layout"
* commit 'd8694667da7561301371cc2c125104076c75608b':
  Add Colemak keyboard layout
2013-07-08 13:45:44 -07:00
Jean-Baptiste Queru
d8694667da am ae6bdf63: Merge "Add Colemak keyboard layout"
* commit 'ae6bdf63f532d136d61d0b7dec9117bfa2d37773':
  Add Colemak keyboard layout
2013-07-08 13:41:32 -07:00
Jean-Baptiste Queru
ae6bdf63f5 Merge "Add Colemak keyboard layout" 2013-07-08 20:31:35 +00:00
Christopher Eby
8c890db75a Add Colemak keyboard layout
Change-Id: I203b92e56522bc7b3014195d5d83dc1fdb3cab15
2013-07-08 13:09:18 -07:00
Scott Main
9c35004eab add xxhdpi information to tablet checklist
Change-Id: I8eff162527a9de59c667a7152b70eed7590ddbe3
2013-07-08 12:44:41 -07:00
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
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
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
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
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
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
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
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
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
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
msg555
b264f5f83f Mixed delete/delete[].
Error found via valgrind.
2013-07-03 19:26:23 -04:00
Baligh Uddin
2b6c25b7d5 am 8b152937: am be432a69: Import translations. DO NOT MERGE
* commit '8b1529375c3cc410f766ec31571a6508be90f3a8':
  Import translations. DO NOT MERGE
2013-07-03 11:38:46 -07:00
Baligh Uddin
8b1529375c am be432a69: Import translations. DO NOT MERGE
* commit 'be432a6983ec479efb211a441e97ce48178b6ebc':
  Import translations. DO NOT MERGE
2013-07-03 11:35:16 -07:00
Baligh Uddin
440df1bbb9 am 505565c3: Import translations. DO NOT MERGE
* commit '505565c3481b59b2856c9b5c42ae19f54fdfcfb1':
  Import translations. DO NOT MERGE
2013-07-03 11:35:02 -07:00
Baligh Uddin
505565c348 Import translations. DO NOT MERGE
Change-Id: I5e1ae1aaa21b272c4731ec6f6f8d70a3c909a35a
Auto-generated-cl: translation import
2013-07-03 11:22:24 -07:00
Baligh Uddin
be432a6983 Import translations. DO NOT MERGE
Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b
Auto-generated-cl: translation import
2013-07-03 11:20:22 -07:00
The Android Open Source Project
48de2c723d Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c
2013-07-03 08:51:11 -07:00