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

97150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Bateman
258384aff2 framework: fix notification icons not animating till ticker is updated 
Fixes Android issue #15657

Change-Id: If3bb8693d99e3415bcf0fa9adadee5c1bdbb990d
 2012-11-30 16:28:54 -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
Dirk Dougherty
cb45ab8ecf 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 '338b3a2f96e7625a31f9cb38033d3444d450c387':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:44:24 -08:00
Nicolas Klein
ca4199ef8b am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '04f3b12f1f82784d0b1b8c0812a3d0017b17b69e':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 15:44:17 -08:00
Dirk Dougherty
338b3a2f96 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 '0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:41:21 -08:00
Nicolas Klein
04f3b12f1f am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 15:41:10 -08:00
Romain Guy
4ac170bd40 Merge "Fix crash in TextDropShadowCache" 2012-11-30 15:40:14 -08:00
Dirk Dougherty
0a40f2d4d2 am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 
* commit '23b4e5b1b5c3af565f2af87be243e7b455002ae7':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:38:19 -08:00
Dirk Dougherty
23b4e5b1b5 Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 2012-11-30 15:35:47 -08:00
Dirk Dougherty
d589421093 Doc change: add SMP Primer for Android. Support a new "article" toc style in training. 
Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5
 2012-11-30 15:33:39 -08:00
Fabrice Di Meglio
cb5f9db47a Fix bug #7651552 resetRtlProperties() is called way too often 
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)

Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
 2012-11-30 15:32:56 -08:00
Romain Guy
69fcbccf47 Fix crash in TextDropShadowCache 
The lengths used to copy/read arrays were completely wrong.

Change-Id: If21f23a73cce59bbd32975760e6d728eeeb9e40d
 2012-11-30 15:29:15 -08:00
Nicolas Klein
5ea914f21b am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 14:54:50 -08:00
Nicolas Klein
759c1005b3 Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 2012-11-30 14:51:43 -08:00
Robert Ly
b38f8ea546 am f701090d: am deab6fd2: am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit 'f701090df6671dca1fa85666248e54a92ce85c34':
  docs: gms fixes
 2012-11-30 14:42:13 -08:00
Nicolas Klein
9f6cb87522 Fix some typos and missing @param in android.os.Bundle 
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.

Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
 2012-11-30 14:41:46 -08:00
Robert Ly
f701090df6 am deab6fd2: am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit 'deab6fd2e8bd94c8449fdc2c926f7973c5661b30':
  docs: gms fixes
 2012-11-30 14:40:40 -08:00
Robert Ly
deab6fd2e8 am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
  docs: gms fixes
 2012-11-30 14:38:18 -08:00
Robert Ly
b67ab7ccd6 am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit '648de5483b20bd80bda267a4430daca2ae0b089a':
  docs: gms fixes
 2012-11-30 14:35:48 -08:00
Robert Ly
648de5483b Merge "docs: gms fixes" into jb-mr1-dev 2012-11-30 14:31:43 -08:00
Andreas Huber
1adc5975fa am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40f 
* commit '800c8ab68d695f1b6c5332c80a32316cdca69954':
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
 2012-11-30 14:28:14 -08:00
Andreas Huber
800c8ab68d am 2644494a: Merge changes I8462f040,Ie471f40f 
* commit '2644494a9841c1f842d790b60911699f09eb63d1':
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
 2012-11-30 14:26:16 -08:00
John Spurlock
cc95712ea2 am 368016f7: am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev 
* commit '368016f769903df05ad5af51e8402dc372d5cd49':
  Only show camera widget to setup users.
 2012-11-30 13:29:14 -08:00