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

161399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
422db53f8c am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 
* commit 'c6de3212c2dd8638bf3150719ed331673fdcab06':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-09 23:44:00 +00:00
Jeff Sharkey
8650c358fb am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 
* commit '1102e712c11e7679da89a2f66288ca4fad4df85c':
  Throw IOException when missing default ringtone.
 2014-12-09 23:43:53 +00:00
Michael Wright
c6de3212c2 Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 2014-12-09 23:39:50 +00:00
Jeff Sharkey
1102e712c1 Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 2014-12-09 23:34:07 +00:00
Luan Nguyen
cbd0032df2 docs: Add Distributing to Android Wear doc 
Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb
 2014-12-09 15:30:24 -08:00
Joe Fernandez
509815b8a7 am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
automerge: d36d2aa

* commit 'd36d2aad9de1859bbf4ef6c1b429e8ac00ddcb2f':
  :docs studio tips and tricks headings updates
 2014-12-09 23:28:59 +00:00
Jeff Sharkey
87d76f6a3e Throw IOException when missing default ringtone. 
This is caught by Ringtone, and we then fall back to built-in
ringtone, which matches the expected CTS behavior.

Bug: 18610451
Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
 2014-12-09 15:27:25 -08:00
Joe Fernandez
d36d2aad9d am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
* commit 'a82fc60ce4cc0f7d1167330f4cbb5736551ddd5c':
  :docs studio tips and tricks headings updates
 2014-12-09 23:22:42 +00:00
John Reck
fe11126d23 am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
  Teach AssetAtlas about more drawables
 2014-12-09 23:18:08 +00:00
Ruben Brunk
6d9826546d Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 
automerge: 3ef5033

* commit '3ef5033cdacbc44702d0b6ba687e81383348e2fd':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:13:06 +00:00
Joe Fernandez
a82fc60ce4 am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
* commit '6d4818529e435b2e6d285233bd0668e3ba25f6c9':
  :docs studio tips and tricks headings updates
 2014-12-09 23:12:53 +00:00
John Reck
4f1942d999 Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
Joe Fernandez
6d4818529e am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
* commit 'b35a509d0eb4d9c150630fc6108f4bc039a09043':
  :docs studio tips and tricks headings updates
 2014-12-09 23:04:13 +00:00
Ricardo Cervera
614889aa1a am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '4a6bafcb56d5fe5e2f30626b8836559e722e89a0':
  docs: Adding links to material design videos
 2014-12-09 22:56:52 +00:00
Joe Fernandez
b35a509d0e Merge ":docs studio tips and tricks headings updates" into lmp-docs 2014-12-09 22:56:37 +00:00
Ricardo Cervera
4a6bafcb56 am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '12a24dc91fa4de5b897acff9a6435647429040d7':
  docs: Adding links to material design videos
 2014-12-09 22:49:10 +00:00
Quddus Chong
da125f4f12 docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient. 
Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35
 2014-12-09 14:44:05 -08:00
Ricardo Cervera
12a24dc91f am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '47fa63553bc53d46bc5e1b8873ff81a774d399e7':
  docs: Adding links to material design videos
 2014-12-09 22:40:55 +00:00
Rich Slogar
5053344bb6 :docs studio tips and tricks headings updates 
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
 2014-12-09 14:23:18 -08:00
John Reck
dad7d84c04 Teach AssetAtlas about more drawables 
Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
 2014-12-09 14:18:33 -08:00
Ricardo Cervera
47fa63553b am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '5155840ba091f62ea3079328b25a620089223887':
  docs: Adding links to material design videos
 2014-12-09 22:16:58 +00:00
Elliott Hughes
a04cd35da0 am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
  Fix typo.
 2014-12-09 22:09:25 +00:00
smain@google.com
92b6011d95 am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit '9ecc18e2e39348abed90eaadf4319b0614c87097':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-09 22:09:20 +00:00
smain@google.com
1bc5b1b987 am 325af3a6: am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs 
* commit '325af3a659a9e15225f5ec3f62ed4682884f103f':
  clarify release notes pages with more specific titles and new links to related docs.
 2014-12-09 22:09:14 +00:00
Rich Slogar
6b07b40da5 am 00d635c0: am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates 
* commit '00d635c0ec07156fd5e98d7c34054a53f0a16545':
  docs:studio basics images updates
 2014-12-09 22:09:08 +00:00
Joe Fernandez
55677d8ad5 am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page 
* commit '33a0828ea6a9bda7eb2e0367a81d396ede5ace9a':
  docs: Change Eclipse deprecation language on sdk/index.html page
 2014-12-09 22:09:03 +00:00
smain@google.com
2049cc91e3 am 8503307d: am d7ce432a: am 2317aa2f: am c4a0882a: edits to sdk install instructions. 
* commit '8503307d67d53f94277ab6b9dbb7f5c59c6aaa85':
  edits to sdk install instructions.
 2014-12-09 22:08:58 +00:00
smain@google.com
7ee7d3252c am 664ab723: am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and update migration guide 
* commit '664ab72332b174829306cb03a4c23ee1442cede3':
  changes to deprecate eclipse docs and update migration guide
 2014-12-09 22:08:53 +00:00
Derek Sollenberger
497499b1eb am 04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev 
* commit '04c2bf4f17091eeb07b96bb0571aa6ad3a45d96b':
  Remove unnecessary/erroneous reference counting
 2014-12-09 22:08:47 +00:00
John Reck
7d74cb6c61 am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '14c436897ca56800a3758008f0631c559a898967':
  Fix issue with RNA destruction mid-animation
 2014-12-09 22:08:42 +00:00
Elliott Hughes
0aac16bbf1 am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
  Fix typo.
 2014-12-09 21:34:06 +00:00
smain@google.com
9ecc18e2e3 am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit '4267450e98ae78877cf77a3b28fb4f449b314114':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-09 21:34:02 +00:00
smain@google.com
325af3a659 am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs 
* commit '5d3ea8af3ce46e53362fda3e42a3df6488ba6367':
  clarify release notes pages with more specific titles and new links to related docs.
 2014-12-09 21:33:31 +00:00
Rich Slogar
00d635c0ec am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates 
* commit 'fbbab5467e5e9af8493099b51ab403ffceb4bd92':
  docs:studio basics images updates
 2014-12-09 21:33:06 +00:00
Joe Fernandez
33a0828ea6 am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page 
* commit '2a83bc2be699069ca3791d920d0ebfc219baaa70':
  docs: Change Eclipse deprecation language on sdk/index.html page
 2014-12-09 21:33:02 +00:00
smain@google.com
8503307d67 am d7ce432a: am 2317aa2f: am c4a0882a: edits to sdk install instructions. 
* commit 'd7ce432ae4ca49f42b23f0bcdc44a091ee96a557':
  edits to sdk install instructions.
 2014-12-09 21:32:58 +00:00
smain@google.com
664ab72332 am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and update migration guide 
* commit 'aba6a4327bf175fff57235cca49955a209b0c034':
  changes to deprecate eclipse docs and update migration guide
 2014-12-09 21:32:52 +00:00
Derek Sollenberger
04c2bf4f17 Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev 2014-12-09 21:27:39 +00:00
Michael Wright
f32bd3c5cd Don't try to scale the bitmaps for null MediaMetadata. 
Bug: 18586572
Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
 2014-12-09 13:23:44 -08:00
Ricardo Cervera
5155840ba0 Merge "docs: Adding links to material design videos" into lmp-docs 2014-12-09 21:16:41 +00:00
John Reck
14c436897c Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 2014-12-09 20:37:17 +00:00
Amith Yamasani
0d2ebc2968 Allow user shutdown broadcasts to be delivered 
Fixes a regression that prevents the user from being fully shutdown
after being stopped. Wasn't killing all user processes.

Bug: 7462778
Change-Id: Iee7231f7c8a167e8a61549b149294b2dbef071c1
 2014-12-09 12:36:57 -08:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation 
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
 2014-12-09 12:35:12 -08:00
Jason Monk
7940f55c3a am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 
* commit '6f6bc554fad7cc2166ea561a1171bd1ffc961498':
  Push inet condition to new MobileSignalControllers
 2014-12-09 20:34:55 +00:00
Pavel Zhamaitsiak
bf7b4d9489 am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit 'f996d6b7ffcfa813727ba57a30903d1f9e2666da':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 20:17:26 +00:00
Pavel Zhamaitsiak
1e989df50d am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '49b00a9ca4281b45234d264871428f800083e77f':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 20:17:20 +00:00
Pavel Zhamaitsiak
d2762ca9bc am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit '14370741898c8725314d638e58da1ca6e12876b7':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 20:17:15 +00:00
Jason Monk
6f6bc554fa Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 2014-12-09 20:13:39 +00:00
Pavel Zhamaitsiak
f996d6b7ff Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 2014-12-09 20:06:55 +00:00