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

154590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
8404550614 am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references 
* commit '20207a83c989fde1d57b45a4c1373ca25fd49bd7':
  docs: multidex - building apps with over 65K method references
 2014-11-01 01:25:26 +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
0e4ef67369 am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit '89e73a1c85c3af19530cd7b9f7093668abba9edb':
  docs:studio-updates-814v2
 2014-10-31 19:35:52 +00: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
515daeead8 am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '307bcbe31636716b35ef0a4ac420e42fc35d19b1':
  revise helpouts tags to use just one on each page
 2014-10-31 18:03:56 +00: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
9b00d795d1 am 0da6b005: revise helpouts tags to use just one on each page 
* commit '0da6b005c1cec9d7a4f6f3259e2deb4a67b37968':
  revise helpouts tags to use just one on each page
 2014-10-31 17:54:48 +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
dcf5af38bf am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-10-31 15:48:44 +00: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
84ca5ddb08 am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 
* commit 'bdb1cf0c1bed1ae32d98c1efb269b87c9797182d':
  docs: Add links to Wear UI training from Design pages.
 2014-10-31 15:21:32 +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
43fda072c2 am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '922e6b6aae0c19b31073e925da7fc813ed54bd4c':
  docs:studio-update-814
 2014-10-31 05:25:48 +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
2182bf5ac8 am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit '3d875f804018ebd48189633bb48ad6083c953eed':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:22:07 +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
dfeb60558e am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
* commit 'b31c2b07140481c2cd45367b16f77a710765bc85':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-10-30 23:29:18 +00: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
6497dd7325 am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
* commit 'b5c5a0dc429d1d1944296bb9f1da403126fabcc5':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 22:39:09 +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
62b532c7f4 am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
* commit 'd2d8c55304438accd9589eaa0cb49fcaae3e54cd':
  Fixes wrongly nested braces. Bug: 17499985
 2014-10-30 20:01:13 +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
Deepanshu Gupta
df0ebab0f9 Support framework menus in ActionBar 
Add support for adding menus in the framework namespace to the ActionBar
preview. If a menu id name begins with the android namespace prefix
(android:) we find the framework menu and render it.

Change-Id: If52910b46154591883af2b2f357e72eea6f84235
 2014-10-30 11:58:37 -07:00
Deepanshu Gupta
0bffc736e1 Use the right layout for inflating Action Bar. 
The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.

Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
 2014-10-30 11:58:37 -07:00
David Friedman
e91c37de78 Fixes wrongly nested braces. 
Bug: 17499985

Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
 2014-10-30 11:55:53 -07:00
David Friedman
7e8d8b8da0 Fixed ADB documentation to work properly on Windows 
Bug: 17192985

Change-Id: Iea9eb4e1eb53718ddfb0ca3e1c5f09504f987457
 2014-10-30 11:19:20 -07:00
Ricardo Cervera
0db8199664 am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0acf536a00cc30ab8420e43321096afba601024':
  docs: Two-page notification fix.
 2014-10-30 15:38:35 +00: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
5298190a30 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
automerge: 3e92c4a

* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-30 05:23:58 +00:00
kmccormick
4d9872e6ec am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '1649712f8745f6b62e453b8b4a230374308732ce':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:26:18 +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
63ee197682 am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:19:46 +00:00