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

153004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
ac87548404 am 4f133894: Exclude KXmlParser from LayoutLib. 
automerge: adb14af

* commit 'adb14afbfb4c37cfc684537d85123b36539fffed':
 2014-11-03 20:40:55 +00:00
Joe Fernandez
9e22cd6fd1 am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
automerge: 37ec657

* commit '37ec65701121374b0edf3cfc454463c90666399d':
 2014-11-03 20:37:46 +00:00
Deepanshu Gupta
ec276ed126 am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] 
automerge: fcaf3e9  -s ours

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
 2014-11-03 20:34:42 +00:00
Rich Slogar
6ae208d455 am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
automerge: 9779c90

* commit '9779c905eac26ab6ce7ce775587c75f1de081dd4':
 2014-11-03 20:33:08 +00:00
Quddus Chong
03f627c4b4 am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
automerge: dfb86b9

* commit 'dfb86b994ff7d51ba1a1683c7123195cc9930c95':
 2014-11-03 20:31:51 +00:00
Quddus Chong
bea6b4d121 am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
automerge: 9566bd2

* commit '9566bd23390b0f21582a59673ded22f47b50ffe0':
 2014-11-03 20:30:45 +00:00
Ricardo Cervera
e5eaf36c01 am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
automerge: 5f9d680

* commit '5f9d680dd73b437e1e311f11f255b659ad18135b':
 2014-11-03 20:29:24 +00:00
Ricardo Cervera
d600764435 am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
automerge: a6abe30

* commit 'a6abe30397cf1f67b871a3db7555aa7f0f9841d9':
 2014-11-03 20:28:06 +00:00
Quddus Chong
c9c186711d am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 
automerge: ddb8c4e

* commit 'ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':
 2014-11-03 20:23:39 +00:00
Ricardo Cervera
d89021d7aa am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
automerge: 2166913

* commit '2166913933661f4f85fd649ad55997d59a5e3d31':
 2014-11-03 20:22:28 +00:00
Rich Slogar
a34b1f1529 am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
automerge: f07d984

* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':
 2014-11-03 20:21:20 +00:00
smain@google.com
c64c937a18 am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':
 2014-11-03 20:20:13 +00:00
Joe Fernandez
4f8399c7ad am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:41:56 +00:00
Joe Fernandez
eff5efac21 Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69 docs: Update Android Dashboard for November 2014 
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
 2014-11-03 11:33:28 -08:00
Ricardo Cervera
fa37321f05 am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit '3e621914cacf692700dce007ec7d7893fcc12a8c':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:31:32 +00:00
Ricardo Cervera
3e621914ca Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 2014-11-03 17:27:09 +00:00
Scott Rowe
1b2cf3f8f6 am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 16:54:29 +00:00
Scott Rowe
cd796536ce Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 2014-11-03 16:24:38 +00:00
Scott Rowe
de74098593 am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:28:23 +00:00
Scott Rowe
aa275bf989 Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 2014-11-01 16:23:12 +00:00
Joe Fernandez
20207a83c9 am e8ad737d: docs: multidex - building apps with over 65K method references 
* commit 'e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
  docs: multidex - building apps with over 65K method references
 2014-11-01 01:14:15 +00:00
Joe Fernandez
e8ad737db6 docs: multidex - building apps with over 65K method references 
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
 2014-10-31 17:38:49 -07:00
Dirk Dougherty
e129d338da Add Nexus 6 and Nexus 9 to the device framer. 
Change-Id: I7e66642429497921e20bad9065dbe5e56e952028
 2014-10-31 23:31:41 +00:00
Scott Rowe
067fbaa8e3 docs: b/15180738 - invalid urls in badge generator 
Change-Id: Ifb7ab1ad1b860c7fb7faec624b7d3ad4244fee36
 2014-10-31 14:52:32 -07:00
Joe Fernandez
89e73a1c85 am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit 'ea17fdecae470beeae8e12666254bf8f6446b06e':
  docs:studio-updates-814v2
 2014-10-31 19:28:30 +00:00
Joe Fernandez
ea17fdecae Merge "docs:studio-updates-814v2" into lmp-docs 2014-10-31 19:23:46 +00:00
Rich Slogar
62fddcd9d9 docs:studio-updates-814v2 
Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
 2014-10-31 12:21:48 -07:00
smain@google.com
307bcbe316 am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '26bf2f7b8730d9b4b1459d229207fe55597b000d':
  revise helpouts tags to use just one on each page
 2014-10-31 17:58:09 +00:00
smain@google.com
26bf2f7b87 revise helpouts tags to use just one on each page 
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
 2014-10-31 17:51:41 +00:00
smain@google.com
0da6b005c1 revise helpouts tags to use just one on each page 
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
 2014-10-31 10:45:23 -07:00
Scott Rowe
4c3a07ba05 docs: b/18119632 isGame, b/18119595 banner 
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
 2014-10-31 09:51:27 -07:00
Alex Klyubin
8129b8b471 am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
* commit 'dd8accfe0f3d71a4e6402595fea48bf435a09b65':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-10-31 15:44:35 +00:00
Alex Klyubin
dd8accfe0f Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 2014-10-31 15:36:45 +00:00
Ricardo Cervera
bdb1cf0c1b Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 2014-10-31 15:16:05 +00:00
Mark Renouf
01afc37403 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: cf0f740  -s ours

* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 09:21:12 +00:00
Joe Fernandez
922e6b6aae am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '81fcc85c23eea3905238f3f8d359df0344c37865':
  docs:studio-update-814
 2014-10-31 05:21:22 +00:00
Joe Fernandez
81fcc85c23 Merge "docs:studio-update-814" into lmp-docs 2014-10-31 05:18:43 +00:00
Mark Renouf
3d875f8040 am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:13:21 +00:00
Mark Renouf
cf0f740e39 If no display settings are matched, return the first one. DO NOT MERGE 
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.

BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
 2014-10-30 21:42:11 -04:00
Rich Slogar
96b245acf0 docs:studio-update-814 
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
 2014-10-30 17:31:33 -07:00
Mark Renouf
ff2e71830c Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
automerge: 7be03da  -s ours

* commit '7be03da0d4365346934c9d6672526119765d1047':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 23:07:22 +00:00
Scott Rowe
b31c2b0714 am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
* commit '397eb67fbf9af409406750ce58a16b64b4a6b1e2':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-10-30 23:06:18 +00:00
Scott Rowe
397eb67fbf Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 2014-10-30 22:55:20 +00:00
Mark Renouf
b5c5a0dc42 am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
* commit '7be03da0d4365346934c9d6672526119765d1047':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 22:33:32 +00:00
Mark Renouf
7be03da0d4 Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 2014-10-30 22:27:05 +00:00
Alex Klyubin
8e93f0c3bc Mention ECDHE_PSK bug in Javadoc of PskKeyManager. 
Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
 2014-10-30 21:39:03 +00:00
Mark Renouf
e69bebd5aa Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE 
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
 2014-10-30 21:03:25 +00:00
David Friedman
d2d8c55304 am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
* commit 'e91c37de784babbe879c78c83817b99d54b61d2f':
  Fixes wrongly nested braces. Bug: 17499985
 2014-10-30 19:56:37 +00:00
Deepanshu Gupta
9fa48b09ad Fix BridgeContext.get*ResourceValue() 
getFrameworkResourceValue() and getProjectResourceValue() never really
returned the defValue passed to them, instead creating a new id for
non-existent resources. We now checks for the existence of the resources
before trying to obtain the id.

Change-Id: Ie3103ba32af6186651a5f77c27d1efc33dc2bcc7
 2014-10-30 12:18:56 -07:00