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

154719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
51209aa38e am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '43582423ee64b4d1e8f0186e34494cc7f7519488':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:20:19 +00: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
03b100e11d am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '617e809731d775d9e05758689bab024e34c9afbf':
  Add missing delegate for AnimatorInflater.
 2014-10-29 17:52:04 +00:00
Geoff Mendal
39ae5dd786 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-29 17:23:52 +00:00
Luan Nguyen
bcb15cc1b1 cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4 
Change-Id: I9f358f94b560e189cc93fb2fca6e885cafa91bac
 2014-10-29 09:00:24 -07:00
Geoff Mendal
3b4a018326 Import translations. DO NOT MERGE 
Change-Id: I490435f6897e37a152de298f96ed1541c208adbb
Auto-generated-cl: translation import
 2014-10-29 08:43:34 -07:00
Geoff Mendal
c88fbd3cce Import translations. DO NOT MERGE 
Change-Id: I1a12ef3a827f9012967fe871ba492647fb78eb60
Auto-generated-cl: translation import
 2014-10-29 06:28:28 -07:00
Wink Saville
f7543b40d2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-29 02:49:36 +00:00
Deepanshu Gupta
617e809731 Add missing delegate for AnimatorInflater. 
Change-Id: I96ef2b1085dadfae280df6740aebc10f57e3b949
 2014-10-28 18:47:28 -07:00
Deepanshu Gupta
de4ee0f1be am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit '75bf1b1c6af0bc0d09b04292565915fab0e49a30':
  Skip loading animations.
 2014-10-29 00:20:42 +00:00
Deepanshu Gupta
916d779650 am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit 'c55eb170cccea10158cedaeccd991b4b97d0036c':
  Fix multiple styles case in resource resolution.
 2014-10-29 00:15:56 +00:00
Deepanshu Gupta
6fb2fda85c am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '92a52142fd988590aa61aedd54f48e9d249a2f53':
  Use right theme for drawable inflation.
 2014-10-29 00:15:52 +00: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
Casey Burkhardt
87023b8eea Disable circular display mask with color inversion 
Causes WindowManagerService to only add a circular display mask on
qualified devices if the accessibility display color inversion
feature is turned off.  When enabled, this causes a visual artifact.

Bug:18120660
Change-Id: I0b1ac08487098942e2e0dd2794905e845a70c1bc
 2014-10-28 16:25:06 -07:00
Wink Saville
78e652a5e4 Import translations. DO NOT MERGE 
This is for lmp-sprout-dev only.

Hide SubscriptionManager and SubInfoRecord for lmp-sprout-dev branch

Change-Id: I5f299a7b200798ada9350bee2c1b26e6f74eaea1
 2014-10-28 15:32: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
56a8cb7fd1 am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '5c0ed74b3886c5765c576e9e427b93c76b37635a':
  docs: Update timing of Android Wear app review
 2014-10-28 19:22:45 +00:00
David Friedman
b648cabadf am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit 'b2d582d995622cc8379603cfadae7ee6d4163b3e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:22:40 +00:00