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

107568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Shmidt
e659f12f0f Merge "wifi: Match function prototype from libhardware_legacy" 2013-05-30 20:00:51 +00: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
Amith Yamasani
306fd7fa9e Merge "UX compliance for error messages" 2013-05-30 18:19:04 +00:00
Amith Yamasani
5a3915b06b UX compliance for error messages 
Bug: 9122154
Change-Id: I4a64750f11845a230321450bc6a2955cb73e3b6d
 2013-05-30 10:37:38 -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
Derek Sollenberger
c648ed7303 Merge "Modifications needed for updating Skia to r9286." 2013-05-30 12:06:47 +00:00
Satoshi Kataoka
c56191f829 Resolve inconsistent conditions in InputMethodService 
This change is addressing this issue by
1. call doFinishInput in onDestroy
2. fix the inconsistent condition of "mInputStarted"

Bug: 9197136
Change-Id: Iefe6b284e148e31bd212b255c41cb2cf548723d7
 2013-05-30 20:14:22 +09: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
Adam Powell
087d2b2df7 Merge "Optimizations for ResolverActivity" 2013-05-30 01:43:32 +00: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
Adam Powell
0256c6f8d3 Optimizations for ResolverActivity 
Load app icons using AsyncTask instead of during list item binding.

Make sorting resolved components by display name case insensitive.

Change-Id: I8e69781ed021035b9f0dac349791b3d8a674cf60
 2013-05-29 18:14:08 -07:00
Dmitry Shmidt
ffa0242dd4 wifi: Match function prototype from libhardware_legacy 
Change-Id: Ibfffd347e22f71753b085d16f185407308b9be36
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-29 18:10:06 -07:00
Baligh Uddin
f4ae104ec4 Import translations. DO NOT MERGE 
Change-Id: I34f5a0541c873ce23afc3a434210bf53d07bedfb
Auto-generated-cl: translation import
 2013-05-29 17:29:53 -07: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
Victoria Lease
c7546a504e Merge "break up LocationManagerService's WakeLock" 2013-05-30 00:08:13 +00:00
Baligh Uddin
f54b433fce Import translations. DO NOT MERGE 
Change-Id: I986339ad7e596a42ad3f10f64adc611c337f6a14
Auto-generated-cl: translation import
 2013-05-29 17:04:39 -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
Victoria Lease
0aa28602d5 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
 2013-05-29 16:18:28 -07:00
Scott Main
e7838dc2e1 am 93c284af: am b7e75478: am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '93c284affe7130df4af8f4ed311ba7ee03c5de82':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:14:47 -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
Romain Guy
c4ea109ba2 Merge "Disable the AssetAtlas when running under valgrind Bug #9191438" 2013-05-29 23:02:19 +00:00
Romain Guy
80b12fcaae Disable the AssetAtlas when running under valgrind 
Bug #9191438

When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)

Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
 2013-05-29 16:01:36 -07:00