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

189237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
7f95a00ec0 Add hardware feature describing a car 
We need to define a hardware feature for when Android is running
embedded on a vehicle's headunit. This is not applicable when
running Android on a phone and projecting onto a headunit.

Bug: 20016089
Change-Id: I70e94564f7493afe70a49bf582a627c5ea9f0a60
 2015-04-22 14:28:25 -07:00
Todd Kennedy
4ff2617265 Merge "update api files" 2015-04-22 18:08:52 +00:00
Todd Kennedy
89902b9040 update api files 
Bug: 20410696
Change-Id: I3a9d14e4031b0746b2527ad2b0ff1c8521c64e1d
 2015-04-22 11:07:28 -07:00
Adam Skory
26d68e50fa Merge "nullcheck Activity.getIntent() for AssistContent" 2015-04-22 17:59:34 +00:00
Quddus Chong
967d2057e9 am a5617d07: am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402 
* commit 'a5617d07623d773a03230866c95712a795149b33':
  cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
 2015-04-22 17:51:25 +00:00
Kris Giesing
1aa5fb9619 am 6ea4f936: (-s ours) am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs 
* commit '6ea4f9361e644e371c2f49454d2832c451648ebd':
  DO NOT MERGE Revert "Load libraries directly from apk"
 2015-04-22 17:51:18 +00:00
Kris Giesing
d516650495 am 2a0c4a3a: (-s ours) am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs 
* commit '2a0c4a3ae091c4a922a1dec040a56c2edcc5e588':
  DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
 2015-04-22 17:51:12 +00:00
Kris Giesing
834678ed8b am b3ebc0f8: am 663cdc5c: Tweak wording on release notes for Leanback. 
* commit 'b3ebc0f8f3cfc3efbd5cda42a303046aa9c71af1':
  Tweak wording on release notes for Leanback.
 2015-04-22 17:51:05 +00:00
Rich Slogar
20a5478af7 am ac66e2aa: am 1c6c22d3: docs: support library 22.1 updates 
* commit 'ac66e2aa292f2bf9924e7189b14813b76ab16304':
  docs: support library 22.1 updates
 2015-04-22 17:50:56 +00:00
Ryosuke Matsuuchi
fd48dcca5f am 12651970: am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page. 
* commit '12651970876f8829d87f2075b0719c766f31dd73':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-22 17:50:49 +00:00
Dirk Dougherty
fad1c48161 am a136b544: am 7e75d3ec: Doc change: distribute landing page. 
* commit 'a136b5442f0dd3cd088e4a2995cb507df1ad604d':
  Doc change: distribute landing page.
 2015-04-22 17:50:42 +00:00
Joe Fernandez
c6820220e4 am c3afa452: am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs 
* commit 'c3afa452b913304232d61ab96d1e2ffe77af1f54':
  docs: studio remove gradle tasks dialog
 2015-04-22 17:50:35 +00:00
Rich Slogar
3ee60bb0a3 am a2fb6d63: am 6b1b71c9: docs: hierarchyviewer updates 
* commit 'a2fb6d63d8b4e18c302e4b08f02c4c7737345d24':
  docs: hierarchyviewer updates
 2015-04-22 17:50:29 +00:00
Dianne Hackborn
f45e16f2da Merge "Work on issue #20401752: device idle and alarms." 2015-04-22 17:49:39 +00:00
Ben Kwa
4b1ebb4f4f Merge "Disable copying from Recents." 2015-04-22 17:46:19 +00:00
Todd Kennedy
cf5715eb30 Merge "Unhide SignalStrength#getLevel()" 2015-04-22 17:37:50 +00:00
Ben Kwa
c5979d98cf Disable copying from Recents. 
Recents view contains a whole bunch of content aggregated from
potentially many different sources.  Dealing with all these in a single
copy operation can be complex, so for simplicity, copying from recents
view is disabled.

BUG=20487641

Change-Id: I6052e62ee0446da7741f13abfed97044e147dd7d
 2015-04-22 10:33:53 -07:00
Adam Skory
4aaed145f8 nullcheck Activity.getIntent() for AssistContent 
Nothing stopping an Activity from giving us a
null Intent, and the Intent copy constructor
requires a non-null arg.

Bug: 20419159
Change-Id: I8b12a127431869394697e947e2298d4dbbe08604
 2015-04-22 11:29:31 -06:00
Quddus Chong
a5617d0762 am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402 
* commit '8408cbe3adc8b0df4ae279a2e8689d1066972744':
  cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
 2015-04-22 17:18:32 +00:00
Kris Giesing
6ea4f9361e am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs 
* commit '0ab9655ae1a84d1f4dd79c964b655555cf684bbd':
  DO NOT MERGE Revert "Load libraries directly from apk"
 2015-04-22 17:18:28 +00:00
Kris Giesing
2a0c4a3ae0 am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs 
* commit '6cf2d35d3b8bb2bf707098b84d16e3135f8ba498':
  DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
 2015-04-22 17:18:24 +00:00
Kris Giesing
b3ebc0f8f3 am 663cdc5c: Tweak wording on release notes for Leanback. 
* commit '663cdc5cfdcff532f0ae43d851cce3172fa5da54':
  Tweak wording on release notes for Leanback.
 2015-04-22 17:18:17 +00:00
Rich Slogar
ac66e2aa29 am 1c6c22d3: docs: support library 22.1 updates 
* commit '1c6c22d3a92b1446eb548b2aca77758534c7d814':
  docs: support library 22.1 updates
 2015-04-22 17:18:06 +00:00
Ryosuke Matsuuchi
1265197087 am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page. 
* commit '2fb3dc2f965db595b6bf2c8c17a170552ccd15e7':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-22 17:17:59 +00:00
Dirk Dougherty
a136b5442f am 7e75d3ec: Doc change: distribute landing page. 
* commit '7e75d3ec4b966442a46f16cf09a54ab541141bc8':
  Doc change: distribute landing page.
 2015-04-22 17:17:55 +00:00
Joe Fernandez
c3afa452b9 am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs 
* commit '7ce1ab5ffbc7c43013b2cf07ca4eb64152679d2b':
  docs: studio remove gradle tasks dialog
 2015-04-22 17:17:50 +00:00
Rich Slogar
a2fb6d63d8 am 6b1b71c9: docs: hierarchyviewer updates 
* commit '6b1b71c96338775da77629ce3f3ed865616fb661':
  docs: hierarchyviewer updates
 2015-04-22 17:17:45 +00:00
Lajos Molnar
ce510d5f62 Merge "media: add annotations to low-level Media* classes" 2015-04-22 17:08:23 +00:00
Andres Morales
6bac04abc9 Merge "Expose getAuthenticatorId API" 2015-04-22 16:56:28 +00:00
Mady Mellor
724866172a Merge "Remove mouse association in scaling, only do it for stylus, update doc." 2015-04-22 16:56:13 +00:00
Andres Morales
4d41a203a0 Expose getAuthenticatorId API 
Change-Id: I112c45d596c66e3f6ebd94fecffcb6bb7c3a335a
 2015-04-22 16:55:10 +00:00
Lajos Molnar
99f8072386 media: add annotations to low-level Media* classes 
Also remove explicit runtime exception added to
MediaExtractor.setDataSource, as other methods don't
explicitly declare it.

Includes MediaCodec, Crypto, Drm, Extractor, Muxer, Sync.

Bug: 19756615
Bug: 19967103
Bug: 16906375
Change-Id: If511d85af7f61808fbe63fbdc6e04a3d2e7e262c
 2015-04-22 09:44:03 -07:00
Geoff Mendal
b5665c9910 Merge "Import translations. DO NOT MERGE" 2015-04-22 16:35:25 +00:00
Geoff Mendal
194aafe83e Import translations. DO NOT MERGE 
Change-Id: Ic26433e787b20012ab8df695e1a6ea48a9746213
Auto-generated-cl: translation import
 2015-04-22 09:33:00 -07:00
Lajos Molnar
5b230c516a Merge "media: define codec color formats (part 1)" 2015-04-22 16:18:50 +00:00
Lajos Molnar
b1fa78c132 media: define codec color formats (part 1) 
Define supported color formats. Deprecate old color formats.

Change-Id: I909acf33a2019e2d5b55080298d5d00f8e9ce71d
 2015-04-22 16:18:31 +00:00
Yang Ni
db720ce9f2 Merge "Move new script group API into ScriptGroup class" 2015-04-22 16:00:09 +00:00
Wale Ogunwale
58f68b56ea Merge "Move home task to front when home stack is moved to front." 2015-04-22 15:30:24 +00:00
Craig Mautner
81786701b6 Merge "Add API for putting up locktask pinning toast." 2015-04-22 14:11:08 +00:00
Neil Fuller
52dbaa08cd Merge "Add checks for types in Parcel / avoid class initialization" 2015-04-22 13:30:02 +00:00
Chris Wren
0f70ca0e66 Merge "Add notification lifetime to the cancel message." 2015-04-22 13:07:38 +00:00
Geoff Mendal
9487a28a78 Merge "Import translations. DO NOT MERGE" 2015-04-22 13:06:51 +00:00
Geoff Mendal
37b4c7989d Import translations. DO NOT MERGE 
Change-Id: I72c5378c90345a929c525db99e47abd0c67fdb2f
Auto-generated-cl: translation import
 2015-04-22 06:05:01 -07:00
Geoff Mendal
79be57ca3d Merge "Import translations. DO NOT MERGE" 2015-04-22 13:03:50 +00:00
Martijn Coenen
3624b170e4 Merge "Add NFC APIs for dynamic resources." 2015-04-22 13:02:06 +00:00
Geoff Mendal
0c886bbb9b Import translations. DO NOT MERGE 
Change-Id: I971de964d782fbfd1b54a1fcb5d1366c7416f0e8
Auto-generated-cl: translation import
 2015-04-22 06:01:35 -07:00
Geoff Mendal
2782432b4e Merge "Import translations. DO NOT MERGE" 2015-04-22 12:48:54 +00:00
Geoff Mendal
7a80d99ac4 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:47:09 +00:00
Geoff Mendal
2ce10f0f85 Import translations. DO NOT MERGE 
Change-Id: Icab122bac2891ca4580116d2c357b7ac64d6baad
Auto-generated-cl: translation import
 2015-04-22 05:45:49 -07:00
Geoff Mendal
9e672e0d18 Import translations. DO NOT MERGE 
Change-Id: I67f51468d775874da33c28786b86c69e7f1459b1
Auto-generated-cl: translation import
 2015-04-22 05:42:32 -07:00