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

152674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ricardo Cervera
f4e32145a2 am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
  docs: Add SearchXonY to Common Intents
 2014-10-28 18:15:17 +00:00
Deepanshu Gupta
b6444c4309 Fix multiple styles case in resource resolution. 
When multiple styles are applied to a theme, we only remembered the last
one. This change fixes the issue.

Change-Id: I46490e882edc3eabe522a641c83366234b5bb25d
 2014-10-28 11:11:10 -07:00
Deepanshu Gupta
4a605c6fa0 Use right theme for drawable inflation. 
The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.

Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
 2014-10-28 11:11:09 -07:00
Scott Rowe
a825c8ee24 docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905 
Change-Id: Ic0e1ab185f4c4f4cf85d4bea016ce459d25d8078
 2014-10-28 10:57:26 -07:00
Joe Fernandez
40bf63e0f0 Merge "docs: Update timing of Android Wear app review" into lmp-docs 2014-10-28 03:25:40 +00:00
Joe Fernandez
a3c9be01e8 docs: Update timing of Android Wear app review 
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
 2014-10-27 20:22:52 -07:00
David Friedman
3c00bc01f9 Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 2014-10-28 02:51:32 +00:00
David Friedman
576a4b7371 Updates Notifications screenshot for Android 5.0. 
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
 2014-10-27 19:29:45 -07:00
Jason Monk
4444c5b278 Add missing passive discovery flag 
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
 2014-10-27 19:25:50 -04:00
Eric Gilmore
d126294a8f Docs: Adding Android Studio instructions for adding IAB service. 
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.

Bug: 17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
 2014-10-27 23:24:39 +00:00
Quddus Chong
2b4b3d289b cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
 2014-10-27 14:47:50 -07:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 11:25:19 -07:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page 
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
 2014-10-25 01:46:20 -07:00
Luan Nguyen
781fe92cfd Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 2014-10-24 23:17:24 +00:00
Luan Nguyen
bfcc2e1a88 am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-24 22:37:25 +00:00
Joe Fernandez
abb8ea3d4b am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-24 22:37:16 +00:00