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

105498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
f7d8d8bfc5 am e302c706: am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'e302c70643e006581c535c76c1c5d50372586ede':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 14:02:05 -07:00
Scott Main
e302c70643 am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'c7dda6454fb513676575a9ce2b28112cdab6cb05':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 14:00:16 -07:00
Scott Main
c7dda6454f am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '77da444049f526cf702403f2543a26e208bd8c7b':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:58:17 -07:00
Scott Main
77da444049 am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '25a49f9f2e33540dc413210f9dd09c6cec141896':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:56:02 -07:00
Scott Main
25a49f9f2e fix IE 7/8 bugs on IO videos page 
Change-Id: I94d47989e8c1075c9864d0a4577434917a7913d7
 2013-05-30 13:51:08 -07:00
Svetoslav
5fecbf9d10 am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev 
* commit 'ec58699413ebe4cc2a72a8aae3c420fb3d764457':
  CalendarView header not updated on year change.
 2013-05-30 12:50:15 -07:00
Svetoslav
ec58699413 Merge "CalendarView header not updated on year change." into jb-mr2-dev 2013-05-30 19:49:00 +00:00
Daniel Sandler
491c607582 am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.
 2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
kmccormick
b2903bc64d am 03a91724: am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '03a9172407103a8788e526be41a7d2c018e426ca':
  Doc change: document AppWidgetHost
 2013-05-30 12:03:01 -07: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
Matthew Xie
0fdb05a770 am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit 'b190890a94dc2f0bd11da09f59550f86197f010a':
  Update javadoc to give app write better guidence
 2013-05-30 11:50:02 -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
7d2e393996 am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit 'c1d47c50d61063dc41214beb93aeea32f77f2550':
  Monitor device rotation
 2013-05-30 09:03:41 -07:00
Jean-Michel Trivi
c1d47c50d6 Merge "Monitor device rotation" into jb-mr2-dev 2013-05-30 16:00:15 +00:00
The Android Open Source Project
f3c2981309 Reconcile with jb-mr2-release - do not merge 
Change-Id: I1c6be297655eb1d928657bbc6fd7e974ddbf9691
 2013-05-30 07:31:34 -07:00
The Android Automerger
d46ceb9d63 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-30 05:55:42 -07: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
b809577f46 am b318f7b9: 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 
* commit 'b318f7b900a3cc0899b6e2a4bd79b9894f29d74f':
  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.
 2013-05-29 18:26:44 -07: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
51ff6f953c am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev 
* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock
 2013-05-29 17:20:01 -07: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
Scott Main
93c284affe am b7e75478: am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit 'b7e75478c3d6c1b1e08a0c6949a9f0174c92991f':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:10:40 -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
40062914b5 am c77e2ade: am b8339676: am 4aeb8cb3: am 1e4cfd8e: am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit 'c77e2adeacb96f7889c557307d942309c2786aa1':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:30:24 -07:00
Scott Main
6e9230cf29 am ccec9de2: am 40f8668a: am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit 'ccec9de2c524fed576c0afa6833ee637684a5ef5':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:26:43 -07:00
Scott Main
90a40ea8d9 am 369994da: am 8cf04a40: am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit '369994da27fd7aac6f0c7da61d782424f875b83b':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:26:41 -07:00
Scott Main
29e24f5ab1 am ae2ab27f: 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 'ae2ab27f3349d11c7dd7a9ca24c0bce5751c196c':
  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:26:38 -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
Amith Yamasani
096d384399 am 3ec14d9c: am 9b76b2d2: Merge "framework:base: iterator error in singletone provider" 
* commit '3ec14d9cf16f1e91a763b77effc3f086dbdfbb1d':
  framework:base: iterator error in singletone provider
 2013-05-29 15:22:30 -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
John Spurlock
c00930f4fe am 50ef7ab7: Docfix: remove confusing "disabled" link label. 
* commit '50ef7ab70ad02deb9ad3694fb894741d6007564a':
  Docfix: remove confusing "disabled" link label.
 2013-05-29 15:18:51 -07:00