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

152697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
David Friedman
e91c37de78 Fixes wrongly nested braces. 
Bug: 17499985

Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
 2014-10-30 11:55:53 -07:00
Ricardo Cervera
e0acf536a0 am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
  docs: Two-page notification fix.
 2014-10-30 15:34:37 +00:00
Ricardo Cervera
e3dd89a42a Merge "docs: Two-page notification fix." into lmp-docs 2014-10-30 15:27:32 +00:00
kmccormick
1649712f87 am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:20:34 +00:00
kmccormick
2b20b9d23a am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:12:52 +00:00
kmccormick
3e92c4a20f am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:09:23 +00:00
kmccormick
13d7ea464e DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

Fix for:
b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 23:06:46 +00:00
kmccormick
1867f2cfdd Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 2014-10-29 23:04:29 +00:00
kmccormick
2022db08ab Doc update: deliv receipt, rate exceeded, bug fixes. 
Fix for:

b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 15:49:36 -07:00
Ricardo Cervera
9a6fdfe853 docs: Two-page notification fix. 
Bug: 18108228

Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
 2014-10-29 14:27:22 -07:00
David Friedman
43582423ee am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '0fa6edced7496b898d31ff7dab7255a1e0dffa9b':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:15:31 +00:00
Deepanshu Gupta
617e809731 Add missing delegate for AnimatorInflater. 
Change-Id: I96ef2b1085dadfae280df6740aebc10f57e3b949
 2014-10-28 18:47:28 -07:00
Deepanshu Gupta
75bf1b1c6a Merge "Skip loading animations." into lmp-dev 2014-10-29 00:13:54 +00:00
Deepanshu Gupta
c55eb170cc Merge "Fix multiple styles case in resource resolution." into lmp-dev 2014-10-29 00:07:59 +00:00
Deepanshu Gupta
92a52142fd Merge "Use right theme for drawable inflation." into lmp-dev 2014-10-29 00:07:42 +00:00
David Friedman
0fa6edced7 Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
 2014-10-28 16:38:11 -07:00