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

90758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Robert Ly
24963e1f7b Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 2012-11-30 11:52:43 -08:00
Svetoslav Ganov
438a3b35f7 Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 2012-11-30 11:43:54 -08:00
Martijn Coenen
f77445cd48 am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev 
* commit 'b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
  Allow the NFC process to call Bluetooth APIs.
 2012-11-30 11:09:43 -08:00
Martijn Coenen
b1a01ab01c Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev 2012-11-30 11:08:07 -08:00
Dianne Hackborn
1bd7d5e47e am 675814d4: Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev 
* commit '675814d488579582e0214cc720d9ccc310173f25':
  Maybe fix issue #7596986: Frequent runtime restarts; IAE at...
 2012-11-30 10:45:02 -08:00
Dianne Hackborn
675814d488 Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev 2012-11-30 10:42:15 -08:00
Nick Kralevich
0def7b9496 am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
  Secure a handful of framework broadcasts
 2012-11-30 10:38:21 -08:00
Nick Kralevich
849f5188e3 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts
 2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b resolved conflicts for merge of 011132a7 to jb-mr1-dev 
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
 2012-11-30 10:23:56 -08:00
Daniel Sandler
5dde83c4d1 am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 
* commit '0a6620e8615ade341336730a5aa9f0e62a295c9f':
  Suppress quick settings if setup has not been completed.
 2012-11-30 10:07:01 -08:00
Robert Greenwalt
011132a7d3 am b8da0376: Secure a handful of framework broadcasts 
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts
 2012-11-30 10:05:33 -08:00
Daniel Sandler
0a6620e861 Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 2012-11-30 10:05:01 -08:00
Scott Main
0988f445a1 am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev 
* commit '73117424029ce1983f2f0a2f706d08e1f5870955':
  docs: gms and gcm javadocs
 2012-11-30 10:01:19 -08:00
Scott Main
7311742402 am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev 
* commit '580aa579080b5f4ccddb31964bc0caa76ee73a7a':
  docs: gms and gcm javadocs
 2012-11-30 09:59:42 -08:00
Scott Main
580aa57908 Merge "docs: gms and gcm javadocs" into jb-mr1-dev 2012-11-30 09:56:48 -08:00
Scott Main
f239a76c15 am 3cddba24: am b74844cd: docs: revise doc titles 
* commit '3cddba247e4f9c188cc654a0c3df9db693874199':
  docs: revise doc titles
 2012-11-30 09:52:22 -08:00
Scott Main
3cddba247e am b74844cd: docs: revise doc titles 
* commit 'b74844cd87160a21a77cdc1c35b3d19ce9f47249':
  docs: revise doc titles
 2012-11-30 09:49:51 -08:00
Scott Main
b74844cd87 docs: revise doc titles 
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
 2012-11-30 09:46:26 -08:00
Makoto Onuki
9522972108 am c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev 
* commit 'c50ed032c71069893d9ad0bb81ee8013fdd44d66':
  Remove unused IExtendedNetworkService
 2012-11-30 09:36:11 -08:00
Makoto Onuki
c50ed032c7 Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev 2012-11-30 09:33:11 -08:00
Eric Laurent
b1f45c4a58 am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 
* commit 'c3eb57b22f930f07448e877f0814eb5659bfc3c5':
  AudioService: improve initial safe volume delay
 2012-11-30 09:28:56 -08:00
Eric Laurent
c3eb57b22f Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 2012-11-30 09:26:30 -08:00
Daniel Sandler
71988c81a3 am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 
* commit '386165a3ae09b150165e8e7c310e194231071271':
  Only show "charging" if the battery is really charging.
 2012-11-30 07:29:46 -08:00
Daniel Sandler
386165a3ae Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 2012-11-30 07:27:36 -08:00
John Spurlock
371f3408d6 Only show camera widget to setup users. 
And remove misspelled and unused field in KeyguardHostView.

Bug:7645811
Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62
 2012-11-30 09:20:43 -05:00
Robert Ly
3c4b4f7c31 docs: gms and gcm javadocs 
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
 2012-11-30 04:02:04 -08:00
Robert Ly
6465381c0d docs: gms fixes 
Change-Id: I197678e85ea2d11f35ccecdd7abc9564035acad4
 2012-11-30 03:07:11 -08:00
Robert Ly
f67ca8007f Revert "docs: gms javadocs" 
This reverts commit 830b23b76676542cbcb5ef3c60c869460d4c5466

Change-Id: I75a9d4f6aa424ed4439b4415d575716a40b75343
 2012-11-30 00:18:20 -08:00
Dirk Dougherty
6875b4385c am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit 'a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:17:03 -08:00
Dirk Dougherty
a4f67a88f4 am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit '49be1ef39cfa2c718cb56dee088338ea97019c11':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:15:04 -08:00
Dirk Dougherty
49be1ef39c Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 2012-11-29 21:11:24 -08:00
Baligh Uddin
02d29ff5fe am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'a1b3b99c7f1c53648b4d2e631a1042be27173cd1':
  Import translations. DO NOT MERGE
 2012-11-29 21:09:05 -08:00