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

83933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
fae0d66275 Merge "Nested fragments." into jb-mr1-dev 2012-09-06 11:41:48 -07:00
Baligh Uddin
6f7c139137 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 11:37:34 -07:00
Jean-Baptiste Queru
bf3e62b891 Merge "Make SimpleSessionDescription locale safe" 2012-09-06 11:22:29 -07:00
Fabrice Di Meglio
8a802dbdab Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources 
- we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3
codespace which uses 3 letters for identifying a language code (and could use either
"rtl" or "ltr" strings for defining a language in the future).

- we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers
are defined by more than 3 chars and outside of what is defined into ISO-639. They
are also more understandable as "ld" prefix is for "layoutdirection"

Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72
 2012-09-06 11:13:24 -07:00
Dianne Hackborn
62bea2f171 Nested fragments. 
Change-Id: I79acc19b391352c16b06afee2ca543223c38e364
 2012-09-06 11:05:53 -07:00
Daniel Sandler
40e86a56da Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev 2012-09-06 11:04:45 -07:00
Chris Craik
378d131e65 Merge "Varying-based AA rect drawing" into jb-mr1-dev 2012-09-06 10:52:14 -07:00
Irfan Sheriff
369bb97d02 Merge "P2p API for WFD" into jb-mr1-dev 2012-09-06 09:54:28 -07:00
Jean-Baptiste Queru
c67fb6c39e am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:18:20 -07:00
Jean-Baptiste Queru
657dba9e66 am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:16:09 -07:00
The Android Open Source Project
7a6475220d am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '1d9c5d8f18b7530c1e72fe86109707cddc198dbd':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:13:45 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:12:17 -07:00
Andreas Huber
ab4cd45133 P2p API for WFD 
Change-Id: I3914a515313654f7032d8bb102afebf0ed776783
 2012-09-06 09:06:13 -07:00
Daniel Sandler
32f6fd55b1 New "Start dreams" launcher shortcut. 
Change-Id: Ice46fc8b99dae615e421ccf4eb6ca6f2a76cbe5f
 2012-09-06 11:52:10 -04:00
Martijn Coenen
32ac1e142c Fix NPE in NdefRecord parser. 
Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
 2012-09-06 17:13:38 +02:00
The Android Open Source Project
1d9c5d8f18 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746
 2012-09-06 08:08:54 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Michael Jurka
4848f42f65 Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 2012-09-06 01:13:59 -07:00
Brian Muramatsu
a92a01bb0b Add wireless to KeyguardUpdateMonitor isPluggedIn 
Bug 7114383

It looks like this wasn't carried over from the old keyguard.

Change-Id: I79d47ac36d84289a3afd9d6df6582a6c8e541181
 2012-09-05 21:54:39 -07:00
Craig Mautner
69b0818179 Limit certain actions to default Display. 
Stop messing up PhoneWindowManager state when passing in windows
from non-default Display.

Change-Id: I472f7a13c5e2241fbf1f79ae1c8045fd92af016c
 2012-09-05 19:54:32 -07:00
Jim Miller
5830cb2882 Cosmetic code changes to face unlock after review. 
Change-Id: I6e4face14c1585ed7123ae9c055b5ac3ccc86395
 2012-09-05 18:54:18 -07:00
Jim Miller
d2d4a64565 Merge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd" into jb-mr1-dev 2012-09-05 18:25:43 -07:00
Jim Miller
6212cc0d3f Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd 
This fixes a bug where we'd stop updating the status view in keyguard
because KeyguardStatusViewManager had no references.

It also fixes a bug where KeyguardUpdateMonitor wasn't removing objects
because objects were being compared with WeakReferences rather than the
content of the WeakReferences.

Bug:7095359

Change-Id: I2d9df6097b2270655ad3662bcf7a6757e0515363
 2012-09-05 18:14:29 -07:00
Jim Miller
e7376e2c2c Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 2012-09-05 16:53:12 -07:00
Chris Craik
6ebdc114e0 Varying-based AA rect drawing 
Instead of calculating opacity from relative position in the shader, use a
shader varying to do this computation for us.

bug:5045101

Also adds a test to HwAccelerationTest to show incorrect antialiasing in
scaled drawAARect / boundarySize calculation.

Change-Id: Icdc41acb01dc10ce354834f8389a5aed2f439162
 2012-09-05 16:45:03 -07:00
Jim Miller
000464ac01 Initial pass at re-enabling face unlock in new keyguard. 
Change-Id: I187629f9c4bfd810f11c73416db6e41b56f09a45
 2012-09-05 16:12:26 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Jason Sams
6d617c2ddd Merge "Stabilize perf data." into jb-mr1-dev 2012-09-05 13:50:36 -07:00
Jason Sams
3e777c7970 Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 2012-09-05 13:48:58 -07:00
Jim Miller
27230f076a Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 2012-09-05 13:45:30 -07:00
Michael Jurka
14895405c1 Fixing issue where recents items would go dim 
Bug: 6772614
Change-Id: I2f57f001d91d6cb445c58ac705e6c3ad1fa70dd3
 2012-09-05 13:40:50 -07:00
Jason Sams
76fb2973b9 Stabilize perf data. 
Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa
 2012-09-05 13:18:43 -07:00
Katie McCormick
96ab46039d Doc update: Appwidgets JB additions. 
Change-Id: Id18a1c82a50fc654e383d9acb53ca61073172287
 2012-09-05 13:07:09 -07:00
Jim Miller
9ca26e4365 Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 2012-09-05 12:49:31 -07:00
Baligh Uddin
f6bdb634c2 Import translations. DO NOT MERGE 
Change-Id: I0825c7b01d6c6a75e18de2531364c7fab66238bf
Auto-generated-cl: translation import
 2012-09-05 12:43:01 -07:00
Dmitry Shmidt
91a65b5339 Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 2012-09-05 12:39:23 -07:00
Daniel Sandler
fd5494b8ef Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* changes:
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:38:25 -07:00
Jean-Baptiste Queru
ec098efcb1 am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:36:04 -07:00
Dmitry Shmidt
8de24dca68 Restore original default Wifi sleep policy (always) 
BUG: b/7092819

Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2012-09-05 12:35:09 -07:00
Jim Miller
f73fbf79a1 Don't depend on LockPatternUtils to get DevicePolicyManager 
This fixes a crash where LockPatternUtils hasn't been set yet and
keyguard attempts to get the device policy for widgets.

This change breaks the dependency by getting a handle to DPM directly.

Bug:7109723

Change-Id: Iecae91474358821ebd30456648377253864c35cf
 2012-09-05 12:23:06 -07:00
Jean-Baptiste Queru
f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
 2012-09-05 12:21:50 -07:00
Baligh Uddin
18621bd682 Import translations. DO NOT MERGE 
Change-Id: I49e9d1c98c3f72140527cb978e7ef341f2532ce4
Auto-generated-cl: translation import
 2012-09-05 12:17:50 -07:00
Jean-Baptiste Queru
342c6bc8e5 am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
5575e97cea Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 2012-09-05 12:03:32 -07:00
Scott Main
f53c571144 am b693f6a9: am 8f58d381: older not lower 
* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
  older not lower
 2012-09-05 12:01:14 -07:00
Scott Main
b693f6a94c am 8f58d381: older not lower 
* commit '8f58d38103bd3ddc68c2b226e80b9f4c60529dae':
  older not lower
 2012-09-05 11:58:55 -07:00
Scott Main
e8c47a88dc am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '3bcf81dfa44a4a583f5c7345849349974e5e121c':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:55:17 -07:00