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

97067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
b1e76ebaab am 2e8dd459: am 4e1b2f44: am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '2e8dd459fb111a8e38b01af4abbebe3b8acb497b':
  Fix typos in LinearLayout comments
 2012-11-30 18:47:09 -08:00
Scott Main
5414bec1d0 am 86174e15: am 15ac2cfb: am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit '86174e15141f17e77dedb604517329f12fd1e49a':
  docs: gcm navtree
 2012-11-30 18:47:05 -08:00
Quddus Chong
cff89f0103 am 42c0dfbb: am f8b74a32: am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '42c0dfbb359a9d331a37fc0e91e5f8883a65ac85':
  docs: Fixed typo in android tool syntax.
 2012-11-30 18:47:02 -08:00
Craig Mautner
52a839de9e am 3351ab27: am f967500e: am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 
* commit '3351ab27b9fc9eb2b21044ac68efebd1cfe85dfb':
  Include child windows when looking for insertion point.
 2012-11-30 18:46:58 -08:00
Fabrice Di Meglio
77c67665c8 Merge "resolved conflicts for merge of 8794c80d to master" 2012-11-30 18:44:21 -08:00
Fabrice Di Meglio
2e8dd459fb am 4e1b2f44: am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '4e1b2f44e9f43b123e00eb210c9fa4ec78710782':
  Fix typos in LinearLayout comments
 2012-11-30 17:20:44 -08:00
Fabrice Di Meglio
4e1b2f44e9 am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '20b76b9fff076241fe305fc99be3be7ab7d10407':
  Fix typos in LinearLayout comments
 2012-11-30 17:18:49 -08:00
Fabrice Di Meglio
20b76b9fff am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '1e761ded55695a9d76a6f00ee9504625581e8d3a':
  Fix typos in LinearLayout comments
 2012-11-30 17:17:03 -08:00
Svetoslav Ganov
01a9adde7a Merge "Adding pool management via the poolable APIs to some classes." 2012-11-30 17:16:54 -08:00
Svetoslav Ganov
be922dc976 Adding pool management via the poolable APIs to some classes. 
1. Removed the support for infinite pool size which nobody was using and
   does not make sense.

2. Update some classes in ViewGroup to use the poolable APIs.

Change-Id: Ifdb8c10968cd06fe53085ec9d3d649f7c9a944b7
 2012-11-30 17:16:17 -08:00
Fabrice Di Meglio
1e761ded55 Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 2012-11-30 17:14:11 -08:00
Scott Main
86174e1514 am 15ac2cfb: am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit '15ac2cfb65601e00e9489545db4b9a39919d297f':
  docs: gcm navtree
 2012-11-30 17:10:51 -08:00
Scott Main
15ac2cfb65 am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit 'ed3d92aea49422c0e5ec117a04fe573ea141962a':
  docs: gcm navtree
 2012-11-30 17:08:59 -08:00
Fabrice Di Meglio
5412ba1cb9 resolved conflicts for merge of 8794c80d to master 
Change-Id: I61313a3dd4cd0bcbf04c16dc17996a997b43fe0c
 2012-11-30 17:08:26 -08:00
Scott Main
ed3d92aea4 am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit '404eeee14521e8b181a9ed28c2291e9389dcf3b1':
  docs: gcm navtree
 2012-11-30 17:07:11 -08:00
Scott Main
404eeee145 Merge "docs: gcm navtree" into jb-mr1-dev 2012-11-30 17:04:31 -08:00
Robert Ly
2123523290 docs: gcm navtree 
Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3
 2012-11-30 17:02:22 -08:00
Romain Guy
53018e520d Merge "Apply dev. settings at runtime Bug #7434649" 2012-11-30 17:00:10 -08:00
Quddus Chong
42c0dfbb35 am f8b74a32: am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit 'f8b74a32dfd7b20b71e06e1516cc5119cfffb2b5':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:46:10 -08:00
Craig Mautner
3351ab27b9 am f967500e: am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 
* commit 'f967500ebaefb95d7a1c14acd05574a0f17ec078':
  Include child windows when looking for insertion point.
 2012-11-30 16:46:03 -08:00
Fabrice Di Meglio
8794c80dd7 am a9854ce9: am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 
* commit 'a9854ce9dfac086533e9d49ac75076bcc579303b':
  Fix bug #7651552 resetRtlProperties() is called way too often
 2012-11-30 16:46:00 -08:00
Robert Ly
b2de7c6d7e am d6803668: am 69780253: am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit 'd6803668304ef1d8aecdcd1ff9e79e25d89f9db5':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:45:43 -08:00
Jonathan Dixon
f50ea4e1a3 Merge "Fix broken more JavaDoc links" 2012-11-30 16:44:39 -08:00
Quddus Chong
f8b74a32df am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '3a195029066fab3bae5797003314e3fa5bbf7e29':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:44:29 -08:00
Robert Ly
d680366830 am 69780253: am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '697802538fda082de697a287473e1592912c0e78':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:44:20 -08:00
Craig Mautner
f967500eba am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 
* commit '46732445b4c02c225544851cb6cf848ec0583494':
  Include child windows when looking for insertion point.
 2012-11-30 16:42:56 -08:00
Quddus Chong
3a19502906 am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '51f5bcac5269b44cd312d16569357416da7b3a82':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:41:49 -08:00
Fabrice Di Meglio
a9854ce9df am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
  Fix bug #7651552 resetRtlProperties() is called way too often
 2012-11-30 16:41:12 -08:00
Quddus Chong
51f5bcac52 Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 2012-11-30 16:39:29 -08:00
Craig Mautner
46732445b4 Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 2012-11-30 16:38:37 -08:00
Robert Ly
697802538f am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '27dcf445eb66ea032992ff30b3cd36770e1ab929':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:38:12 -08:00
Fabrice Di Meglio
ce463847db Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 2012-11-30 16:37:17 -08:00
Robert Ly
27dcf445eb am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '037b7944bdd5909c503cdc959b0105ebb0ecca92':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:36:05 -08:00
Robert Ly
037b7944bd Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 2012-11-30 16:33:51 -08:00
Jonathan Dixon
47aaba3faf Fix broken more JavaDoc links 
Change-Id: Ic1c74c739a668871e37b7b5868f1bc9ed3a65828
 2012-11-30 16:32:17 -08:00
Romain Guy
5bb3c730f5 Apply dev. settings at runtime 
Bug #7434649

Change-Id: I16f00eaa8a5eefd9f9849e196cf2cb1659215390
 2012-11-30 16:29:33 -08:00
Quddus Chong
4e58eca788 docs: Fixed typo in android tool syntax. 
Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8
 2012-11-30 16:26:35 -08:00
Jonathan Dixon
35cc3fb363 Merge "Fix broken JavaDoc" 2012-11-30 16:18:24 -08:00
Robert Ly
672b3ad589 docs: update javadocs with gcm @value stuff 
Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05
 2012-11-30 16:15:46 -08:00
Craig Mautner
7b1aa77a9b Include child windows when looking for insertion point. 
After finding a window in the window list we turn around and look in
the AppWindowToken.windows list for it. If it is a child of a window
in that list we should use the parent windows index as the search
result. Instead we gave up and ended up inserting the window at the
beginning of the windows list.

Bug 7357465 fixed.

Change-Id: If77f343b8597bfbb0b7fa41dedf7972d78d03020
 2012-11-30 16:14:45 -08:00
Jim Miller
f8b26c67ad am cd4d3495: am f6fe2444: am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 
* commit 'cd4d34954c39a005c66e8ee438032d7e51b9f473':
  Add logging to try and track down bug 7643792
 2012-11-30 16:04:42 -08:00
Jim Miller
cd4d34954c am f6fe2444: am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 
* commit 'f6fe244422166d0120dbbc8c8cf360a99f215d8b':
  Add logging to try and track down bug 7643792
 2012-11-30 16:02:12 -08:00
Jim Miller
f6fe244422 am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 
* commit 'e431e6a352125f2c51507130cc64e3405625a7ec':
  Add logging to try and track down bug 7643792
 2012-11-30 16:00:17 -08:00
Irfan Sheriff
8575c6637f Merge "Cleanup logging" 2012-11-30 15:59:34 -08:00
Irfan Sheriff
f0afe4144d Cleanup logging 
Change-Id: Ieea19853c069266b55cad80cce3743b5ba91218a
 2012-11-30 15:58:46 -08:00
Jim Miller
e431e6a352 Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 2012-11-30 15:57:46 -08:00
Jim Miller
2b84b817e4 Add logging to try and track down bug 7643792 
Fix whitespace & log message.

Change-Id: I9d241365503a6a9b02d3155dbb06ddb82065b375
 2012-11-30 15:54:38 -08:00
Jonathan Dixon
7c28219cc9 Fix broken JavaDoc 
Change-Id: I1e6d595f0fcd1a816ed39aaa801f7d451eb39f85
 2012-11-30 15:53:28 -08:00
Dirk Dougherty
f66b74fa80 am cb45ab8e: am 338b3a2f: am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 
* commit 'cb45ab8ecfbe3827d1084480ff60d11126fcf6eb':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:52:29 -08:00
Nicolas Klein
a3b7e450bc am ca4199ef: am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit 'ca4199ef8b70f73f914b72ec69fc596c2ca600e2':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 15:52:25 -08:00