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

105789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
9b76b2d29f Merge "framework:base: iterator error in singletone provider" 2013-05-29 22:04:01 +00:00
John Spurlock
50ef7ab70a Docfix: remove confusing "disabled" link label. 
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
 2013-05-29 17:43:16 -04:00
Svetoslav
a085179558 CalendarView header not updated on year change. 
The calendar view was updating its header only if the focused
month changes. Removed the check whether the displayed month
changed before setting it since the setter is carefully called
only in cases when there is a change. Hence, now if the year
or the month change, we update the header. This is the safest
and least intrusive fix.

bug:9167305

Change-Id: I98200bb57580f6416abd30c6c25454d4474add64
 2013-05-29 14:37:34 -07:00
Joe Malin
e55ba43171 Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 2013-05-29 21:30:44 +00:00
Scott Main
248573b858 update homepage banner for videos to point to new io13 video channel 
Change-Id: Ibdf384a3e3e0e082c3d4118efde3ecc69a206fa3
 2013-05-29 12:27:09 -07:00
Lajos Molnar
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Dirk Dougherty
91ea7882cd am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'f64588a2ce6a0e4e76d7d48c47f82785553b13f3':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-29 11:42:03 -07:00
Santos Cordon
828a77adf8 am 57f0de12: am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '57f0de12912c7412820b74e119c4a5e3ad2bc203':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-29 11:41:50 -07:00
Dianne Hackborn
8d25fba838 Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev 2013-05-29 18:25:30 +00:00
Scott Main
04a36f704a Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev 2013-05-29 18:19:27 +00:00
Scott Main
896f61d913 add page for google IO videos 
this is a scrappy page with inline styles and such as a first iteration.
plan is to clean this up and make it extensible later

Change-Id: I3351f6d79f42b807b84540e1c00092440d9b83d8
 2013-05-29 11:09:07 -07:00
The Android Open Source Project
452b488c51 Reconcile with jb-mr2-release - do not merge 
Change-Id: I126272e67629e850e151f5601a03812c4b9b1782
 2013-05-29 08:05:59 -07:00
The Android Automerger
230e518473 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-29 05:55:19 -07:00
Jun Su
cca0965a1b framework:base: iterator error in singletone provider 
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.

Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
 2013-05-29 14:33:59 +08:00
Dave Burke
17486b9749 am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev 
* commit 'ed8f94fc454098889ccc6cf7745447090dc16905':
  Fix up device sounds.
 2013-05-28 22:57:59 -07:00
Dave Burke
ed8f94fc45 Merge "Fix up device sounds." into jb-mr2-dev 2013-05-29 05:56:04 +00:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
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
a1f49d8bb7 am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev 
* commit '295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
  Don't show emergency calls label unless it's a phone.
 2013-05-28 21:37:59 -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
466ceb463f am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart
 2013-05-28 21:23:11 -07: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
e3425ac426 am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'af1e512e3f2b52e563e37c1635cbea06e87e0592':
  Import translations. DO NOT MERGE
 2013-05-28 20:44:52 -07: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
Andrew Hsieh
222ff39fe2 am 64b5f7cc: am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '64b5f7cc4ca094754d4631ffb801b7bb771081ec':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:10:02 -07:00
Andrew Hsieh
64b5f7cc4c am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '09377ddb93a964b9e0def6d84b8beb3a515f4a18':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:08:54 -07:00
Andrew Hsieh
09377ddb93 Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 2013-05-29 00:06:54 +00: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
Jeff Sharkey
2c4b090551 am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'ab4a0541994d5de9520ad4ba37c3a11c5f540eb5':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:49:16 -07:00
Jeff Brown
c8a7773562 am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
  Bug fix for building the hover target list
 2013-05-28 15:49:13 -07:00
Jeff Sharkey
ab4a054199 am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'e4c29de9c69d332d65d2eb490961faffab4467fd':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:46:08 -07:00
Jeff Brown
dea6e86dce am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
  Bug fix for building the hover target list
 2013-05-28 15:46:00 -07:00
Jeff Brown
ef0c3e269f am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master 
* commit 'c8c82009dc8c146efadac6b51702922148f6003f':
  Properly rotate full [-pi, +pi] orientation range if available
 2013-05-28 15:45:43 -07:00
Jeff Brown
c8c82009dc resolved conflicts for merge of 7573e594 to stage-aosp-master 
Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f
 2013-05-28 15:43:16 -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