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

104095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
6ea0636a9c Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 2013-05-29 05:25:47 +00:00
Dirk Dougherty
f64588a2ce am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:23:11 -07:00
Dirk Dougherty
de8ac602e3 am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '963e3ec55f2ecbb132a627c8d0f6c19d83bc60b8':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:21:09 -07:00
Dirk Dougherty
963e3ec55f am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '71d1af4a7308eeed249bf9b54549311fb781669f':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:18:59 -07:00
Santos Cordon
57f0de1291 am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'd8754689595ab4b5e4e43a89178080d344374869':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:18:48 -07:00
Dirk Dougherty
71d1af4a73 am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'a284e2013af9624f0093d58ea8d14994c8eda316':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:17:52 -07:00
Santos Cordon
d875468959 am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'c72949c6bc6f5654f09482309d9d3ac03aadd67d':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:16:51 -07:00
Dirk Dougherty
a284e2013a Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-29 05:16:01 +00:00
Santos Cordon
c72949c6bc am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7999c22867c75f39214d8fa6d99ae61ec8aacc7a':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:15:39 -07:00
Santos Cordon
7999c22867 am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7fb15ce74bbc06c88660440f84845a1f3108c3d3':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:14:28 -07:00
Dave Burke
fbdb7d25de Fix up device sounds. 
Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
 2013-05-28 21:44:29 -07:00
Daniel Sandler
295eddb92f Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev 2013-05-29 04:36:24 +00:00
Robert Greenwalt
aa4b2ee0d6 Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 2013-05-29 04:21:25 +00:00
Baligh Uddin
af1e512e3f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:42:23 +00:00
Robert Greenwalt
e9868c1ba0 Ignore outstanding delayed shutdown on restart 
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
 2013-05-28 19:33:48 -07:00
Dirk Dougherty
367ce906c8 Doc change: adjust description of NEW_OUTGOING_CALL. 
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
 2013-05-28 17:59:38 -07:00
Jean-Michel Trivi
bb6f8711a7 Monitor device rotation 
If requested by ro.audio.monitorOrientation property, set orientation
 information as audio system parameter on configuration changes.

Bug 9095903

Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
 2013-05-28 17:33:16 -07:00
Santos Cordon
7fb15ce74b Update documentation of NEW_OUTGOING_CALL 
Adds call-handling as a use case for NEW_OUTGOING_CALL

Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
 2013-05-28 16:00:11 -07:00
Jason Noguchi
c6cedc84f4 Refactor of camera stress test to add camera test helper. Also add 
additional functional tests for: flash, exposure, white balance, and
focus mode.  Also add pairwise tests.

Slight refactor to add camera test helper and also additional
tests for: flash, exposure, white balance, and focus mode

Bug: 9174937

Change-Id: I3d26b545dc8ff972c8173066df59a2e572a837ef
 2013-05-28 15:28:32 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Maunik Shah
46c94b6626 DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition 
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
 2013-05-28 13:46:24 -07:00
Daniel Sandler
8b268d461b Don't show emergency calls label unless it's a phone. 
Bug: 9042105
Change-Id: I8ffb6a66851878cdf22be9a20dbf57f5b6b48002
 2013-05-28 16:17:13 -04:00
Scott Main
e0329cae82 am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5bd6794468df7f7900f1e0a37c24653dd524a5c8':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:49:25 -07:00
Scott Main
5bd6794468 am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:45:25 -07:00
Scott Main
5fbe17fe2a am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:43:50 -07:00
Scott Main
27ab718e7c Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 2013-05-28 18:41:37 +00:00
Joe Malin
ba0256fdc5 Docs bug fix: B9085293 - Stop Location Updates 
Change-Id: I8dd9e6ca59bac628ba834a86f50783170964e652
 2013-05-28 10:50:58 -07:00
John Spurlock
ee352cca1f Merge "Fix typo in View.java javadocs" into jb-mr2-dev 2013-05-28 16:33:49 +00:00
Scott Main
0e11e8ef4b am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:03:37 -07:00
Scott Main
6e5ee7ddf2 am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit 'ea32597832aada5f811c9ca1c1baf008d62ab64a':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:00:51 -07:00
Scott Main
597a837449 am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:59:09 -07:00
Scott Main
ea32597832 am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '005d2afb308f474352ec4b504cf661851e4c2e59':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 08:58:18 -07:00
Scott Main
afaff6e2e9 am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:57:27 -07:00
Scott Main
005d2afb30 Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 2013-05-28 15:56:24 +00:00
Scott Main
fb22f9cb04 am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit '5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:54:59 -07:00
Scott Main
5d64a1932d Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 2013-05-28 15:53:04 +00:00
Scott Main
0b92682d29 am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
  new android studio download v0.1.1
 2013-05-28 08:42:24 -07:00
John Spurlock
44b1edd948 Fix typo in View.java javadocs 
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
 2013-05-28 11:40:58 -04:00
Scott Main
43fa2b8853 am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '718011ac851dcd8925ebeaf4f5516b7b1b62a647':
  new android studio download v0.1.1
 2013-05-28 08:39:42 -07:00
Scott Main
718011ac85 am d4b710c6: new android studio download v0.1.1 
* commit 'd4b710c69800acd0a9237a64e73d62ac9ba3a517':
  new android studio download v0.1.1
 2013-05-28 08:37:35 -07:00
Baligh Uddin
451b69eee5 Import translations. DO NOT MERGE 
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
 2013-05-27 09:55:15 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
Yu Shan Emily Lau
b830d527de Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 2013-05-25 01:51:40 +00:00
Scott Main
4a47f17a9d Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 2013-05-25 01:17:06 +00:00
Romain Guy
529a9e391e Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 2013-05-25 00:38:26 +00:00
Romain Guy
90e10cc586 TransitionDrawable should not become a LayerDrawable 
Bug #9057757

Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.

Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a
 2013-05-24 17:31:17 -07:00
Scott Main
eebec7b1fe Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 2013-05-24 21:40:45 +00:00
Scott Main
509267d618 add links to orientation flags in attribute docs 
to help determine the supported API level for each value
and update the manifest reference page with new attributes

Change-Id: I583a9b3f3be759be71044533055dec26e3616b72
 2013-05-24 14:32:14 -07:00