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

106215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
af39e2622c merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:27 -07:00
Scott Main
5c949ee481 am 0ebc82fe: am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '0ebc82fe79966882bf6cf798afa6c67e1fc7d196':
  add link to cloud backend blog post
 2013-07-08 18:22:42 -07:00
Scott Main
0ebc82fe79 am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '597d7040309d86e366be7804238750ccc733a7ad':
  add link to cloud backend blog post
 2013-07-08 18:20:40 -07:00
Scott Main
597d704030 am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '61e1a650c032c1169c31aad7e0aed085c400327d':
  add link to cloud backend blog post
 2013-07-08 18:18:26 -07:00
Scott Main
61e1a650c0 am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit 'e4d65d24c3d9b6ce286193c451b1e90fb2265215':
  add link to cloud backend blog post
 2013-07-08 18:15:25 -07:00
Scott Main
e4d65d24c3 am eceeaf11: add link to cloud backend blog post 
* commit 'eceeaf11467e53cbc7196695953d28ad896a3c6d':
  add link to cloud backend blog post
 2013-07-08 18:13:19 -07:00
Scott Main
eceeaf1146 add link to cloud backend blog post 
Change-Id: I38376ff9ceaa7338f03cdfe6cd1685efafa1a4e2
 2013-07-08 17:29:22 -07:00
Scott Main
da31f2ea92 docs: add link to developer survey on main landing pages 
Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76
 2013-07-08 16:16:21 -07:00
Joe Malin
a62413772e Doc Bug: b9739899 Bugs in Sync Adapters training 
Change-Id: Ia6f0fc79c73dd66a1d8306e49ff51fc29fb62c7f
 2013-07-08 15:37:34 -07:00
The Android Open Source Project
7c2ea97483 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
 2013-07-08 15:33:43 -07:00
Jean-Baptiste Queru
9058a6c881 am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index" 
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
  FastScroller: Fix to use appropriate index
 2013-07-08 14:43:01 -07:00
Jean-Baptiste Queru
928e045f9a am b8b94d9b: am 538bd4d8: Merge "Fixing missing internal link in document." 
* commit 'b8b94d9bb18bd693b77050414d82a3975268ad08':
  Fixing missing internal link in document.
 2013-07-08 14:42:59 -07:00
Jean-Baptiste Queru
6cd4281dae am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java" 
* commit '65ba6d11e1f3ecf33a5b6e68ab8a6322e993b4d8':
  Fix typo in AlertController.java
 2013-07-08 14:42:56 -07:00
Scott Main
5bd3741d5b am e17a0082: am 0f22b5c3: am 375d9f33: am b13f9eeb: am 9c35004e: add xxhdpi information to tablet checklist 
* commit 'e17a0082f038edd10af7cf35de0ca599a5ccff78':
  add xxhdpi information to tablet checklist
 2013-07-08 14:41:50 -07:00
Scott Main
e17a0082f0 am 0f22b5c3: am 375d9f33: am b13f9eeb: am 9c35004e: add xxhdpi information to tablet checklist 
* commit '0f22b5c311fbe47ae6d26de6c2002acddaa1e086':
  add xxhdpi information to tablet checklist
 2013-07-08 14:39:22 -07:00
Scott Main
0f22b5c311 am 375d9f33: am b13f9eeb: am 9c35004e: add xxhdpi information to tablet checklist 
* commit '375d9f333a8acd12587de4b9393b63d1e379ca53':
  add xxhdpi information to tablet checklist
 2013-07-08 14:36:23 -07:00
Scott Main
375d9f333a am b13f9eeb: am 9c35004e: add xxhdpi information to tablet checklist 
* commit 'b13f9eeba107ef21d7488db88821e3b41242cf32':
  add xxhdpi information to tablet checklist
 2013-07-08 14:34:20 -07:00
Scott Main
b13f9eeba1 am 9c35004e: add xxhdpi information to tablet checklist 
* commit '9c35004eabc48509c22d27f0a32ef7391e7ce923':
  add xxhdpi information to tablet checklist
 2013-07-08 14:32:23 -07:00
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