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

85453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
ffded18154 am 957fadc5: Merge "Use min group owner intent for concurrency" into jb-mr1-dev 
* commit '957fadc5001be0f0b4d004dbed8c57b6e1f5b46a':
  Use min group owner intent for concurrency
 2012-09-21 13:34:58 -07:00
Jason Sams
4a77c9db6a am da6f7ab3: Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev 
* commit 'da6f7ab34c23a6cbe31734e5d562baa224e3d3d6':
  Fix aprox fs function names bug b206696
 2012-09-21 13:34:55 -07:00
Romain Guy
7d00dee7fc am 596bcc23: Merge "Optimize tiling management Bug #7186819" into jb-mr1-dev 
* commit '596bcc23a7cbf07d1465cfc8caa33b6c87fe6a16':
  Optimize tiling management Bug #7186819
 2012-09-21 13:34:51 -07:00
Mathias Agopian
9f85dfb88d am 0aac9b7d: Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev 
* commit '0aac9b7d53946c6e5d8d3855afb3d993aee14519':
  GLSurfaceView defaults to 888 instead of 565
 2012-09-21 13:34:47 -07:00
Jeff Brown
9f94633370 am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev 
* commit 'b4c33679cbdec9e12369fb49469ce33ed83ed25c':
  Disentangle input manager service startup.
 2012-09-21 13:34:44 -07:00
Jeff Brown
76a678e802 am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev 
* commit 'ddfaa3f55638db2e3d7c9928b605c2e6b90facae':
  Provide a debugging option to force enable wifi display.
 2012-09-21 13:34:40 -07:00
Nick Kralevich
987f1e759c Merge "allowBackup doc fix." into jb-mr1-dev 2012-09-21 13:34:36 -07:00
John Reck
cea904c91e am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
  Use less static synchronized
 2012-09-21 13:34:36 -07:00
Fabrice Di Meglio
fe3b3c03a3 am a21ad1a3: Merge "Fix bug #7198224 TimePicker widget shouldn\'t be completely RTL" into jb-mr1-dev 
* commit 'a21ad1a39423a22921511432f61dbfe2f4b3e58b':
  Fix bug #7198224 TimePicker widget shouldn't be completely RTL
 2012-09-21 13:34:33 -07:00
Eric Laurent
41da58338f am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev 
* commit '6730c3c69f84d799198365e0692b79be72b0eeb7':
  Fix safe volume warning message flickering
 2012-09-21 13:34:29 -07:00
Zhihai Xu
ad577aae75 am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 
* commit '77f6677bcddad7c626ef5432eead4031c24f4685':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
 2012-09-21 13:34:26 -07:00
Baligh Uddin
a91074953d am 2f98008d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2f98008d06cbe48f0f5619d16f59988952c9b2ca':
  Import translations. DO NOT MERGE
 2012-09-21 13:33:39 -07:00
Christopher Tate
5d978525bc am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
  Multiuser awareness in content observer infrastructure
 2012-09-21 13:33:34 -07:00
Tsu Chiang Chuang
dad8235dca am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev 
* commit '6cc5d7fc0b23305fb7a3216b814d96d1ebab76d7':
  fix broken user build: do not throw an error when in user flavor.
 2012-09-21 13:33:17 -07:00
Tsu Chiang Chuang
4990a850ff am c1ec220c: Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev 
* commit 'c1ec220c4b3f518d74be91b7a69fb42af6642ad1':
  Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode.
 2012-09-21 13:33:01 -07:00
Dianne Hackborn
22b46b6fa4 am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
  Implement multi-user PackageMonitor.
 2012-09-21 13:32:57 -07:00
Dianne Hackborn
342737d543 am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 
* commit 'e6f6380027d5c209eb17ec2567f00356ad32038a':
  Fix issue #7196015: system_server deadlock during setup wizard
 2012-09-21 13:32:45 -07:00
Irfan Sheriff
917fc95cac am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '314488b791d36756504ee593f818f04b4cd24893':
  Captive check for both mobile and wifi
 2012-09-21 13:32:22 -07:00
Derek Sollenberger
642030e3b3 Merge "Ensure that the decoder is thread-safe." into jb-mr1-dev 2012-09-21 13:32:11 -07:00
rich cannings
4e5753f5f6 Add setting to skip verifying ADB installs 
Create a setting "verifier_verify_adb_installs" to allow developers to control
package verification on ADB installs only. If package verification is enabled,
the setting will:

0, Do not perform package verification on apps installed through ADB/ADT/USB
and perform package verification on all other installs.

1, Use package verification on all installs. (Default)

Bug: 7183252
Change-Id: I9d3eb8abb5ba5e93f8634d3135794e92ff6273b6
 2012-09-21 13:26:15 -07:00
Daniel Sandler
df655d09c0 Merge "Fix javadocs to fix build." into jb-mr1-dev 2012-09-21 13:01:58 -07:00
John Spurlock
5e416d8803 Fix javadocs to fix build. 
Change-Id: I6d7d63b9322f225124f722a245c1222540afbff4
 2012-09-21 15:56:13 -04:00
Lei Zhang
534a076c81 Fix auto-merger error in I74c0644c6938d28c20c42d88d995ffb56a71d703 
Change-Id: If199aa3f01d1a7ea3f298504c0de4aa9a96e7451
 2012-09-21 12:39:39 -07:00
John Spurlock
2250550187 Merge "Additions to Dream public api." into jb-mr1-dev 2012-09-21 12:28:35 -07:00
Winson Chung
3ed6f9456a Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023) 
Change-Id: Iea717e97bf90301bef68b06e1a35644e24ab029d
 2012-09-21 11:59:12 -07:00
Svetoslav Ganov
0c6f3795b3 Day numbers in CalendarView have incorrect size. 
1. The text size of the paint for drawing week days was never set.

bug:6933206

Change-Id: Ie50286d46e2c21a9c2d5f51b309a49f17d46d4b9
 2012-09-21 11:49:05 -07:00
Romain Guy
4187f92892 Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 2012-09-21 11:20:58 -07:00
Romain Guy
8a624ef0fe API REVIEW: Undeprecate Location.dump() 
Bug #7173109

Change-Id: Ia2f4a5b6255dae7ace4702f7d66ec30a077c9c79
 2012-09-21 11:20:00 -07:00
Craig Mautner
9921d842bb Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev 2012-09-21 11:17:51 -07:00
Nick Kralevich
5cb61c8a3d allowBackup doc fix. 
Clarify that setting allowBackup="false" opts an application
out of both backups AND RESTORES.  The previous documentation
implied this setting was for backups only.

Bug: 7211025
Change-Id: I89f095be36d4d0016a8c05928b1922755a7cd75a
 2012-09-21 11:16:16 -07:00
Svetoslav Ganov
abcaeea1ee NPE in AcitivtyChooserModel. 
1. If there is not current intent sent and the client tries to
   choose an activity a NPE occurs. The code in chooseActivity
   now checks for null intent. Note that having a null intent
   is a valid state.

bug:6738922

Change-Id: I91d4415649ce070d4fa4aa187e9eac02928dd38c
 2012-09-21 11:10:27 -07:00
Glenn Kasten
43e5916e67 am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
 2012-09-21 11:04:39 -07:00
Wink Saville
77196b41da am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev 
* commit 'ca2cb1841099c7206af93149d0326308e0d3f81a':
  Suppress location information for non-active users.
 2012-09-21 11:04:35 -07:00
Chris Craik
61d37041ac Merge "Polygonal rendering of simple fill shapes" into jb-mr1-dev 2012-09-21 11:03:59 -07:00
Dianne Hackborn
739bc9e3f5 Merge "Fix issue #7205845: Permissions screen: make "New" text blue instead of red" into jb-mr1-dev 2012-09-21 10:58:55 -07:00
Dianne Hackborn
adfe87c661 Fix issue #7205845: Permissions screen: make "New" text blue instead of red 
Change-Id: I8f359d22dc0a9ddc058cd9a49459a846924338ee
 2012-09-21 10:57:45 -07:00
Romain Guy
3f7c246f3e Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev 2012-09-21 10:50:12 -07:00
Jason Simmons
f445a77bf3 resolved conflicts for merge of d053554f to jb-mr1-aah-dev 
Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159
 2012-09-21 10:38:01 -07:00
Bjorn Bringert
45b07b9427 Merge "Add intents to open text and video from search." into jb-mr1-dev 2012-09-21 10:30:20 -07:00
Dan Morrill
466bd63681 Merge "New method returning user metadata." into jb-mr1-dev 2012-09-21 09:53:57 -07:00
John Spurlock
d5c582c494 Additions to Dream public api. 
- lightsOut() -> setLightsOut(boolean)
   (deprecated lightsOut, will remove once all baked-in dreams are updated)
 - Added ability to keep the screen bright (default = false).
 - Lights out is now true by default.
 - Consistent setters(setXxx) + getters(isXxx) for
   interactive, lightsOut, fullscreen, and screenBright dream attributes.
   Can set attributes at any time (even before window is created).
 - Fleshed out javadocs for public api.
 - Reordered things a bit.
 - Added example of manifest dream declaration ready for copypasta.
 - Removed unused action constant, added category constant.

Bug:7172816
Bug:7111868
Change-Id: I721db7a1a5e5ad047a3723b4d5141ef53b0970af
 2012-09-21 12:37:11 -04:00
Victoria Lease
37563c5249 Get your own cursor Drawables, WebViewClassic! 
These are shared resources! You can't just animate *everyone's*
cursors!

This is a hand-merge of Icdc86af4fba427a352019cd3e2017f97a3b9fdba
from jb-dev branch. I'm not sure why it wouldn't automerge, as it
seemed pretty straightforward...

Bug: 7110290
Change-Id: I131a611b9e16699a51d3769658f079c2ae4cf262
 2012-09-21 09:31:11 -07:00
Eric Laurent
f1a457d06c Do not turn safe volume on upon headset connection 
It is not a requirement to force headphone volume limitation
back on when a headset is plugged in. Only turn it back on
when the device is power off or after 20 hours of cumulative
music listening.

Bug 7064975.

Change-Id: Idabd417a9a9b8096552119c0ff528ba193cfdb5d
 2012-09-21 09:22:26 -07:00
Victoria Lease
95c942eb22 am 4feac670: (-s ours) am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 
* commit '4feac670487b17c34331bccf650951e7f1b45a4b':
  Get your own cursor Drawables, WebViewClassic!
 2012-09-21 09:06:44 -07:00
Craig Mautner
ac439e57a7 Eliminate potential for NPE in WindowAnimator. 
Fixes bug 7209850.

Change-Id: I8c8751ab240ea389a2a779c94c05fe786ca8762a
 2012-09-21 08:58:34 -07:00
Baligh Uddin
5ce605c130 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 08:32:20 -07:00
Baligh Uddin
537d47f510 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-21 08:24:52 -07:00
Daniel Sandler
ced8d21f5a Add string for 'Ethernet'. 
Bug: 6676469
Change-Id: Icbeb3e96b8580850a8392f443dc277488631bcab
 2012-09-21 07:32:04 -07:00
Daniel Sandler
0887711d0f Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 2012-09-21 07:30:43 -07:00
Florian Uunk
b1ac72b54b Add intents to open text and video from search. 
We're adding support for searching for text (books, magazines) and video
(tv, movies).

Bug: 7208141
Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
 2012-09-21 15:15:04 +01:00