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

154630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Gilmore
77760e753e am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit '9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:22:37 +00:00
Quddus Chong
eb07af2ced am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:22:15 +00:00
Ricardo Cervera
be07f2a853 am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit 'f4e32145a214b28522d67e748c0eff74aa915bf6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:22:11 +00: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
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
 2014-10-27 19:19:22 -07:00
Luan Nguyen
418239190b am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
automerge: aec7c97

* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-28 01:44:10 +00:00
Joe Fernandez
3d76f6a957 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
automerge: 90f734e

* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-28 01:43:13 +00:00
Natalie Masse
9f6ea5841c am 1e5bb861: Link and typo fixed 
automerge: bcf9ced

* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-28 01:42:13 +00:00
Scott Rowe
e0da6ddc08 am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
automerge: a1e3063

* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-28 01:41:06 +00:00
Joe Fernandez
d6ed5752da am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
automerge: 2f9ea27

* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-28 01:40:11 +00:00
Prashant Malani
a8f4b8a260 Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
automerge: 645e017  -s ours

* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-28 01:39:14 +00:00
Ricardo Cervera
884b473ad8 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
automerge: dc1f308

* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-28 01:38:14 +00:00
Luan Nguyen
cc8b36706c am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
automerge: c07a288

* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-28 01:37:14 +00:00
smain@google.com
870afdb39a am 075531ae: add the butterbar for L announce to Preview landing page 
automerge: e43bb6a

* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-28 01:36:21 +00:00
smain@google.com
469c8c8983 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
automerge: 6fbe299

* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-28 01:35:28 +00:00
Ricardo Cervera-Navarro
4687757290 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
automerge: c93723b

* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-28 01:34:31 +00:00
Rich Slogar
d84910b06b am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
automerge: 858cfad

* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-28 01:33:39 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag 
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
 2014-10-28 00:52:56 +00:00
Eric Gilmore
068cb36877 Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp 
Conflicts:
	docs/html/guide/topics/connectivity/nfc/nfc.jd
 2014-10-27 17:15:23 -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
Ying Wang
475d7393bf Update current.txt with generics to field types. 
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
 2014-10-27 22:35:59 +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
Ricardo Cervera
bf79153ce9 docs: Add links to Wear UI training from Design pages. 
Bug: 17897252
Bug: 17315120

Change-Id: I58185b76f8197a0124804a296bd32565e4487a33
 2014-10-27 19:28:28 +00:00
Ricardo Cervera
ca7100102a docs: Add instructions to attach debugger to a running process. 
https://code.google.com/p/android/issues/detail?id=77527

Change-Id: I0c8d0be14c3e240688a31dacb5690ec821fc2adb
 2014-10-27 19:25:50 +00: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