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

152825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Ricardo Cervera
5f79d17a6b docs: Fix the circularReveal example. 
Change-Id: Iac7cab08c179f7f5318ba0e5ed6bad1dd2b29b4e
 2014-10-29 13:43:57 -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
Deepanshu Gupta
0b42936d86 Skip loading animations. 
This is a temporary fix until Path.approximate() is supported.

Bug: http://b.android.com/77865
Change-Id: I28739e58f51fabaaf1dcc1c9be61cd0b17e84eec
 2014-10-28 15:07:25 -07:00
Joe Fernandez
5c0ed74b38 am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
  docs: Update timing of Android Wear app review
 2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995 am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4 am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 18:15:20 +00:00