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

125120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
f3c3edfee8 am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit 'bafdb90070bf3f5120599efd322fdd20a31e84ef':
  docs: add EU legal notice
 2014-07-16 19:28:57 +00:00
Robert Ly
bafdb90070 am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice
 2014-07-16 19:23:46 +00:00
Quddus Chong
6743f1ea92 am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '1a2a9730e605e5a3ea46db1049bf950a669cb0d3':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:17:18 +00:00
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
23a0b3d9d5 am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '211c58448e21ad210a497658fdf1dd26b0c96faf':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:13:14 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
Deepanshu Gupta
6c57fc3019 DO NOT MERGE - Fix LayoutLib. 
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
 2014-07-16 10:23:28 -07:00
kmccormick
fc8a3b5f06 Merge "Doc Update: new Smack sample." into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Ricardo Cervera
2f84fbd9f9 docs: Fix typo in Wear docs. Bug: 16327298 
Change-Id: I682b9bba9d01712b98d5de97d31ef2d88b5b6ea0
 2014-07-16 09:02:36 -07:00
Chris Smith
7a04794186 docs: Fix minor issues with Wear data events docs. 
Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
 2014-07-16 14:49:36 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
  NDK filesizes and hashes updated
 2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3 am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
  docs: add edu video highlights
 2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00
Robert Ly
8231174ec5 am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
  NDK filesizes and hashes updated
 2014-07-16 13:22:54 +00:00
Ricardo Cervera
b5cd197646 am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:22:50 +00:00
Robert Ly
1374f6ea86 am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
  docs: add edu video highlights
 2014-07-16 13:22:47 +00:00
Andrew Solovay
0791c612b9 am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:22:44 +00:00
Quddus Chong
b2b1c5fa89 am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:22:44 +00:00
Ricardo Cervera
0acf9d2f9a am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit 'de138276f1c0a02f91e32f889639c629d883f948':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:22:43 +00:00
David Friedman
ddf853e0ce am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:22:43 +00:00
Ricardo Cervera
9e8179ae05 docs: Fixed RecyclerView example. Bug: 15973665 
Change-Id: Ia3c2264d014c8d2e67b2ee96d097be110042c56f
 2014-07-15 17:01:09 -07:00
Prashant Malani
14bff9f55e Make the booting flag update unconditional 
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
 2014-07-16 00:00:41 +00:00
Bill Yi
96f6a1a9e7 DO NOT MERGE - Fix build issue isScreenOn 
Change-Id: I8821efd561d375c32702be55903fe401ab719e80
 2014-07-15 22:50:55 +00:00
Ricardo Cervera
5a19dd522f am 35396800: Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev 
* commit '3539680063e039f5d543677805de7f4639575b1e':
  docs: Added note on disabling debugging for WebView apps. Bug: 16232761
 2014-07-15 21:05:38 +00:00
Ricardo Cervera
3539680063 Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev 2014-07-15 20:39:52 +00:00
kmccormick
9c311fb4c6 Doc Update: new Smack sample. 
Change-Id: I4395d13eab5e7801dae85394350536ae6cb38e9e
 2014-07-15 13:26:37 -07:00
Ricardo Cervera
122b21a408 docs: Added note on disabling debugging for WebView apps. Bug: 16232761 
Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
 2014-07-15 09:47:24 -07:00
Andrew Solovay
63477e67eb Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 2014-07-15 16:06:37 +00:00
Andrew Solovay
5ae1335477 cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38 
Doc had inaccurately said that getLaunchIntentForPackage() throws an
exception if the package name is not recognized; in fact, it returns
null. Also cleaned up some style issues for that Javadoc item.

Doc is staged to:

http://asolovay.mtv:9655/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)

Bug: 15022655
Original SHA1: I2eab0956eaedac71289e19a3618a3553908f8c38

Change-Id: Ief8dfaac248ba03779c6f13237aff9b26d362fd9
 2014-07-15 15:08:58 -07:00
Robert Ly
649e8f9b2b Merge "docs: add edu video highlights" into klp-modular-docs 2014-07-15 16:05:22 +00:00
Robert Ly
7298a3f5c2 docs: add edu video highlights 
Change-Id: I1339245330087486faf95023d3a4e8b4dc687a6e
 2014-07-15 11:00:57 -07:00
Ricardo Cervera
c79f3d696a Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 2014-07-15 16:05:04 +00:00
Ricardo Cervera
d0d737a95e cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee 
Change-Id: I328fc60924d76c633e2f2576c514df22153cdc80
 2014-07-15 09:55:05 -07:00
Robert Ly
bf42978e14 Merge "NDK filesizes and hashes updated" into klp-modular-docs 2014-07-15 16:05:01 +00:00
David Friedman
cac77051a7 NDK filesizes and hashes updated 
Change-Id: I537f46335a27a753f93e8a7b85c3405e7bd3124c
 2014-07-15 11:41:28 -07:00
Andrew Solovay
3f8d9c9e0a Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 2014-07-15 16:05:01 +00:00
Quddus Chong
6a5dd93652 docs: Fixed typo in L Preview API Overview. 
bug: 15696551

Change-Id: I410fa60b9f60ff61a80cd5b059d4b6bd52c33a04
 2014-07-15 02:39:27 +00:00
Ricardo Cervera
de138276f1 docs: Fix typos in the L preview docs. Bug: 16240486 
Change-Id: I44b417b0a38fc2ce89220cd087d8f2bbd58562f8
 2014-07-15 02:38:21 +00:00
Wei Liu
c84e73d103 am 9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share" 
* commit '9d43fa84054dc3c0229f5138495f6b6cdf0477db':
  Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
 2014-07-14 23:18:00 +00:00
Deepanshu Gupta
357ebfc5e4 Fix default level flags for bidi. [DO NOT MERGE] 
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
 2014-07-12 02:10:50 +00:00