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

93632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Robert Ly
672b3ad589 docs: update javadocs with gcm @value stuff 
Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05
 2012-11-30 16:15:46 -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
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
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
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
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
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
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
Andreas Huber
2644494a98 Merge changes I8462f040,Ie471f40f 
* changes:
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
 2012-11-30 13:26:51 -08:00
John Spurlock
368016f769 am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev 
* commit 'bd0e180893c33f6958d4940709687ef2a52e8336':
  Only show camera widget to setup users.
 2012-11-30 13:26:47 -08:00
John Spurlock
bd0e180893 am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev 
* commit '4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
  Only show camera widget to setup users.
 2012-11-30 13:24:39 -08:00
Daniel Sandler
57b47ae95d am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev 
* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
  Add constant for Daydream settings.
 2012-11-30 13:22:03 -08:00
Robert Ly
c9c948ba49 am 50246b5b: am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev 
* commit '50246b5bc637b166aca1ca188c465800506fc2e3':
  docs: add correct toc for google reference
 2012-11-30 13:22:00 -08:00
Robert Ly
6decbd92b4 am 849cef07: am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 
* commit '849cef07389517f3d08c1217c7c4e004ac5f2636':
  Revert "docs: gms javadocs"
 2012-11-30 13:21:56 -08:00
Svetoslav Ganov
d902dbb2ea am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit 'ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 13:21:53 -08:00
Jason Sams
98a09c64d5 am 43174b7d: am 718fb9f1: Fix sample code issues 
* commit '43174b7d2250d5afecabd5a97d2f7fbddc753fd7':
  Fix sample code issues
 2012-11-30 13:21:50 -08:00
John Spurlock
4015c3f815 Merge "Only show camera widget to setup users." into jb-mr1.1-dev 2012-11-30 13:20:09 -08:00
Daniel Sandler
9e129f37b6 am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev 
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
  Add constant for Daydream settings.
 2012-11-30 13:17:22 -08:00
Robert Ly
50246b5bc6 am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev 
* commit '861c55ffcc854563f4adec0b094c1b6948c72036':
  docs: add correct toc for google reference
 2012-11-30 13:17:15 -08:00
Robert Ly
849cef0738 am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 
* commit '1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
  Revert "docs: gms javadocs"
 2012-11-30 13:17:11 -08:00
Svetoslav Ganov
ed734d98d0 am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 13:17:08 -08:00
Jason Sams
43174b7d22 am 718fb9f1: Fix sample code issues 
* commit '718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
  Fix sample code issues
 2012-11-30 13:16:57 -08:00
Daniel Sandler
924fc3e6ce Merge "Add constant for Daydream settings." into jb-mr1.1-dev 2012-11-30 13:03:08 -08:00
Elliott Hughes
9813e365e5 am 940ad4aa: Merge "Make AudioGroup.add locale safe" 
* commit '940ad4aaef6ad27a2a214559100a18100b2b3b24':
  Make AudioGroup.add locale safe
 2012-11-30 12:45:30 -08:00
Robert Ly
861c55ffcc am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev 
* commit '2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea':
  docs: add correct toc for google reference
 2012-11-30 12:40:43 -08:00
Robert Ly
1c92ce10b5 am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 
* commit '24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
  Revert "docs: gms javadocs"
 2012-11-30 12:40:40 -08:00
Svetoslav Ganov
0e7adaff99 am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 12:40:37 -08:00
Jason Sams
718fb9f12e Fix sample code issues 
Correct min SDK.
Correct file extension on mandelbrot

Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
 2012-11-30 12:32:36 -08:00
Robert Ly
2dd93e22b6 Merge "docs: add correct toc for google reference" into jb-mr1-dev 2012-11-30 12:13:07 -08:00
Robert Ly
01b88d3478 docs: add correct toc for google reference 
Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd
 2012-11-30 11:58:19 -08:00