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
Svetoslav
ec58699413 Merge "CalendarView header not updated on year change." into jb-mr2-dev 2013-05-30 19:49:00 +00:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
kmccormick
03a9172407 am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit 'fa312ff108702388574021a8de22092cdde5dd6f':
  Doc change: document AppWidgetHost
 2013-05-30 12:00:58 -07:00
kmccormick
fa312ff108 am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '33b117c493dbddbbe688aa618b99db99ae71d1de':
  Doc change: document AppWidgetHost
 2013-05-30 11:59:00 -07:00
kmccormick
33b117c493 am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '6959f7fad13018e14255ea98ada4221cca28bfab':
  Doc change: document AppWidgetHost
 2013-05-30 11:56:48 -07:00
kmccormick
6959f7fad1 am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '4f3cadafbb1aa53cbd197239127b1d3c626cb0df':
  Doc change: document AppWidgetHost
 2013-05-30 11:54:02 -07:00
kmccormick
4f3cadafbb am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit 'b3803855b0554879836c18b4157194b9c2061219':
  Doc change: document AppWidgetHost
 2013-05-30 11:52:11 -07:00
kmccormick
b3803855b0 Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 2013-05-30 18:48:27 +00:00
Matthew Xie
b190890a94 Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 2013-05-30 18:45:42 +00:00
Matthew Xie
b30f91e38c Update javadoc to give app write better guidence 
Update javadoc of close methods of GATT cliet and server
Update javadoc of BluetoothAdapter
bug 8963528

Change-Id: I45ec618fd495225ed11a6171f33bfdc218397d4c
 2013-05-30 11:42:26 -07:00
kmccormick
25072c7d7b Doc change: document AppWidgetHost 
"Bug: 7540054, 6984998"

Change-Id: Ice48c7023687d0a4aea95a4a10212e6fdd66363f
 2013-05-30 09:59:36 -07:00
Jean-Michel Trivi
c1d47c50d6 Merge "Monitor device rotation" into jb-mr2-dev 2013-05-30 16:00:15 +00:00
Jean Chalard
e811de2d6c Improve the documentation for InputConnection. 
- Add many details to most methods.
- Add comments specific to IME authors and to editor authors.
- Add missing return value docs.
- Straighten out single-spacing vs double spacing.

Bug: 8843866
Change-Id: If1f6dcf0457d5332a7ebb1ebfb1967c6ff0df722
 2013-05-30 18:03:39 +09:00
Daniel Sandler
f3c1c7ea0a Unhide action to launch Daydream settings. 
Bug: 9088316
Change-Id: I70b87e1f320cef4f53b2610a94be8e552dd3a757
 2013-05-29 22:28:22 -04:00
Jason Noguchi
b318f7b900 Merge "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." into jb-mr2-dev 2013-05-30 01:23:48 +00:00
Victoria Lease
d9f7250a1d Merge "break up LocationManagerService's WakeLock" into jb-mr2-dev 2013-05-30 00:17:40 +00:00
Victoria Lease
a9770e4f06 break up LocationManagerService's WakeLock 
This commit splits LocationManagerService's monolithic WakeLock into
per-LocationManagerService.Receiver WakeLocks, for better WorkSource
accounting. This should make it easier to debug location-related
power issues.

Change-Id: I0d2897c305a38099f9663dc1bc9354ce4bbe1077
(cherry picked from commit 0aa28602d51bf41e46d18ffefe724ebc3ff7a704)
 2013-05-29 17:11:25 -07:00
Baligh Uddin
9d16cc6cc8 Import translations. DO NOT MERGE 
Change-Id: I011dcd6cb4a7a86a0391ff6510f3776b798343d7
Auto-generated-cl: translation import
 2013-05-29 16:50:19 -07:00
Scott Main
b7e75478c3 am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '9940dc4e0ed69b83cb3c896b934eeacc1db47765':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:07:57 -07:00
Scott Main
9940dc4e0e am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '408c6601a1b2851ed872125a2291bff73a88285b':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:05:30 -07:00
Scott Main
408c6601a1 am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '79bff4c14cd4f44377e244cc91a0a5c6168aae14':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:02:57 -07:00
Scott Main
79bff4c14c fix FF bug wrt scrolltop in video page 
Change-Id: Ie48f9e457f6f873804933a7f2309a217810ebc89
 2013-05-29 16:00:19 -07:00
Joe Malin
c77e2adeac am b8339676: am 4aeb8cb3: am 1e4cfd8e: am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit 'b8339676a20f665453fda9d6f52e0e6c040bbd7d':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:26:29 -07:00
Joe Malin
b8339676a2 am 4aeb8cb3: am 1e4cfd8e: am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit '4aeb8cb3fbc342d41abdfa21d242439aadeb9f86':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:24:11 -07:00
Scott Main
ccec9de2c5 am 40f8668a: am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit '40f8668a5f3bde3b89225a047775ccca30d33c40':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:22:01 -07:00
Scott Main
369994da27 am 8cf04a40: am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit '8cf04a40b9776776db835bede661f6103db078d0':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:21:56 -07:00
Scott Main
ae2ab27f33 am d0a87a5d: am 54fd2ab2: am 04a36f70: 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 
* commit 'd0a87a5d141347d6cf5862b743807fce37ffddc4':
  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
 2013-05-29 15:21:53 -07:00
Joe Malin
4aeb8cb3fb am 1e4cfd8e: am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit '1e4cfd8ecf1c96e124c26d66446a63fcf0665184':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:20:26 -07:00
Scott Main
40f8668a5f am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit 'ca725a1a7d080a13071170ab28064d116bc7e901':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:19:28 -07:00
Scott Main
8cf04a40b9 am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit 'efbcdcd15e8dac9f8ed16c5ec0f00c8c56dc4974':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:19:25 -07:00
Scott Main
d0a87a5d14 am 54fd2ab2: am 04a36f70: 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 
* commit '54fd2ab2a95f261d55b9a8630dc121c8b24ee3a8':
  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
 2013-05-29 15:19:22 -07:00
Dirk Dougherty
932fbcc817 Doc change: restore warning not to abort NEW_OUTGOING_CALL. 
Change-Id: Icdd4ae184b2a989ac2967420cb5b471aac70808f
 2013-05-29 15:19:14 -07:00
Joe Malin
1e4cfd8ecf am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit 'f0bca9034874c26e42c35f65d376d77e514b6ef9':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:18:44 -07:00
Joe Malin
f0bca90348 am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit 'e55ba43171cb46cc95aa90f83524c4751c7030ff':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:16:45 -07:00
Scott Main
ca725a1a7d am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit '92ff58628bc8768910723bfc6a2978b05176b470':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:16:04 -07:00
Scott Main
efbcdcd15e am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit '248573b8584524bffb6be035fb1afefa3b714d4c':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:16:01 -07:00
Scott Main
54fd2ab2a9 am 04a36f70: 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 
* commit '04a36f704ac2c646ebc4c29f6b26f3c907dab7f8':
  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
 2013-05-29 15:15:58 -07:00
Scott Main
92ff58628b Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev 2013-05-29 22:11:24 +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
Dave Burke
ed8f94fc45 Merge "Fix up device sounds." into jb-mr2-dev 2013-05-29 05:56:04 +00:00