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

87764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7c012e034c am 95c942eb: am 4feac670: (-s ours) am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 
* commit '95c942eb227a6740611ac9d00eaafad9da515a11':
  Get your own cursor Drawables, WebViewClassic!
 2012-09-21 09:09:31 -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
364f4a90b4 Merge "Import translations. DO NOT MERGE" 2012-09-21 08:29:57 -07:00
Baligh Uddin
d1ef3f49b2 am 537d47f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '537d47f510ce49acee09516ed5dde680d910ff94':
  Import translations. DO NOT MERGE
 2012-09-21 08:27:15 -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
eeab8b7fb3 am ced8d21f: Add string for \'Ethernet\'. 
* commit 'ced8d21f5abf46d128264a3039f7a84155d2b9dc':
  Add string for 'Ethernet'.
 2012-09-21 08:02:02 -07:00
Daniel Sandler
89e27caa0c am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 
* commit '0887711d0f76d858501fd017259ddfdc1950eb3f':
  Add Notification.Builder.setShowWhen(boolean).
 2012-09-21 07:34:13 -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
The Android Automerger
1618868a25 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 06:59:43 -07:00
Daniel Sandler
daa05ce16b am 4c8172be: am 1227233b: Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev 
* commit '4c8172be2042d3b933381985d4a9a54eed1078f3':
  Bugreport in Quick Settings (if you turn it on).
 2012-09-21 05:59:28 -07:00
Daniel Sandler
ff38a46089 am d6273f4a: am a2facc33: Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev 
* commit 'd6273f4a43adb2cd65e11f94fa9eda9ddc11001d':
  Fix the seesaw behavior on the status panels.
 2012-09-21 05:57:42 -07:00
Daniel Sandler
4c8172be20 am 1227233b: Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev 
* commit '1227233b6fcb9a6ef1aee8daa34bc3e18191f0db':
  Bugreport in Quick Settings (if you turn it on).
 2012-09-21 05:57:37 -07:00
Daniel Sandler
d6273f4a43 am a2facc33: Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev 
* commit 'a2facc33cd8f8a717561ceb02efcbaf3c92a1bbe':
  Fix the seesaw behavior on the status panels.
 2012-09-21 05:55:57 -07:00
Daniel Sandler
1227233b6f Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev 2012-09-21 05:54:24 -07:00
Daniel Sandler
a2facc33cd Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev 2012-09-21 05:53:05 -07:00
Derek Sollenberger
cd77583ed3 Ensure that the decoder is thread-safe. 
This prevents issues where one thread recycles the decoder while another
thread is in the process of checking the decoder's status or in the process
of decoding a region.

bug: 6880937
Change-Id: I7f755bf2149d03594e528ca79c536713b1447a55
 2012-09-21 08:19:05 -04:00
Wu-cheng Li
edc1a2bbc5 Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE 
bug:7141738
Change-Id: If0109671a072e978501e238fe3d7554693a92157
 2012-09-21 19:04:24 +08:00
Michael Jurka
8f7ac705f8 am 3b3bd0f5: am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev 
* commit '3b3bd0f5031c6dafcd34c1b6335c33d1f877c01b':
  Add support for changing status widget on security screen
 2012-09-21 01:15:32 -07:00
Wu-cheng Li
17a5666183 am ff05108d: am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev 
* commit 'ff05108dc6a0213bbce551554e426e8d8f20a418':
  Add secure version of image capture intent.
 2012-09-21 01:13:54 -07:00
Michael Jurka
3b3bd0f503 am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev 
* commit '7566abd305a2b3060ae541055ed04f087f5266ec':
  Add support for changing status widget on security screen
 2012-09-21 01:13:14 -07:00
Wu-cheng Li
ff05108dc6 am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev 
* commit 'c9cc62b96561933dd9257a78c6749195fbe8fdd3':
  Add secure version of image capture intent.
 2012-09-21 01:11:31 -07:00
Michael Jurka
7566abd305 Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:10:53 -07:00
Wu-cheng Li
c9cc62b965 Merge "Add secure version of image capture intent." into jb-mr1-dev 2012-09-21 01:08:00 -07:00
Romain Guy
11cb642756 Update layers in a single batch at the beginning of a frame 
Bug #7186819

Change-Id: Ice5926dfedfb3be3a3064e65008dafa2852407da
 2012-09-21 00:39:43 -07:00
Wu-cheng Li
37959ef70f Add secure version of image capture intent. 
bug:7141738

Change-Id: I77789ffb53e70efd946f331286a895b7a1239661
 2012-09-21 14:47:47 +08:00
Raph Levien
8cba91d0d1 am 8b0851ca: am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev 
* commit '8b0851caf26dfd5e1cc7798e5ff6c6adc3a5e92c':
  Fix for native crash on image decode OOM
 2012-09-20 23:30:48 -07:00
Raph Levien
8b0851caf2 am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev 
* commit '3034d45104f954eb15937e03ec74d86ca37894dc':
  Fix for native crash on image decode OOM
 2012-09-20 23:28:14 -07:00
Raph Levien
3034d45104 Merge "Fix for native crash on image decode OOM" into jb-mr1-dev 2012-09-20 23:25:26 -07:00
Amith Yamasani
f16c559cff am e6a5c571: am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev 
* commit 'e6a5c571c3bb174fe66d2f418070c549bc195c98':
  Query users excluding any being removed
 2012-09-20 23:13:21 -07:00
Amith Yamasani
e6a5c571c3 am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev 
* commit '74defbf202de713aa6ae19fbbf2ea5c318ccd11c':
  Query users excluding any being removed
 2012-09-20 23:11:03 -07:00
Amith Yamasani
74defbf202 Merge "Query users excluding any being removed" into jb-mr1-dev 2012-09-20 23:08:45 -07:00
Raph Levien
005bfc694d Fix for native crash on image decode OOM 
When decoding an image with scaling, if the allocation of the bitmap
data for the scaled bitmap failed, we were just ignoring it and going
on. This was yielding strange native crashes (bug 7196860 and bug
7175536). This patch checks whether the allocation succeeds, and returns
a null bitmap if not.

Of course, if the app really is OOM because it's allocated too many
bitmaps, it'll still get the OOME, but that's a lot nicer than a native
crash or memory corruption.

Change-Id: I8384059ab11c2ab9e93e283b9438d79e6709b7b1
 2012-09-20 22:51:47 -07:00
Daniel Sandler
c19d4488ea Bugreport in Quick Settings (if you turn it on). 
Bug: 7190871
Change-Id: I8d10f18daed08aac1878cf6ba8937855d9494abd
 2012-09-21 01:48:21 -04:00
Jim Miller
8d9c1acb75 am 15fccd19: am 3e87eafc: Merge "Fix the build." into jb-mr1-dev 
* commit '15fccd19a04cfa763ceb6d0b5e4781ac5d77cecc':
  Fix the build.
 2012-09-20 22:36:54 -07:00
Amith Yamasani
920ace0bbc Query users excluding any being removed 
Keep track of user creation and last logged-in time.
adb shell dumpsys users
User switcher shouldn't show users about to be removed.
No need to check for singleton for activities.

Bug: 7194894
Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
 2012-09-20 22:33:43 -07:00
Jim Miller
15fccd19a0 am 3e87eafc: Merge "Fix the build." into jb-mr1-dev 
* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75':
  Fix the build.
 2012-09-20 22:28:43 -07:00
Jim Miller
3e87eafc7d Merge "Fix the build." into jb-mr1-dev 2012-09-20 22:01:35 -07:00
Jim Miller
e5de9919b4 Fix the build. 
Change-Id: I80e2c915ba4c10dcb53b6a21152dc787e16d9e8f
 2012-09-20 21:57:46 -07:00
Dianne Hackborn
edf07cc718 am e40950d7: am d3724b95: Merge "Don\'t load views before onResume called." into jb-mr1-dev 
* commit 'e40950d78c8c549a4769e366d275ce8c36982dec':
  Don't load views before onResume called.
 2012-09-20 20:28:40 -07:00
Fabrice Di Meglio
69235be493 am eedda1d1: am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 
* commit 'eedda1d1c66c736b68027c452402292edef4d4ae':
  Fix bug #7205072 Text inside popup window is too close to the edge
 2012-09-20 20:28:37 -07:00
Jeff Brown
a627db895e am 2872e019: am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev 
* commit '2872e01929dc2fcfdec03166b9a16577743b59b8':
  Fix javadoc.
 2012-09-20 20:28:33 -07:00
Joe Fernandez
af7ad1360e am 4e482b97: am b4544d68: am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit '4e482b97910d4e19b0792071950279485ce7e87f':
  docs: Systrace tool documentation
 2012-09-20 20:28:29 -07:00
Jean-Baptiste Queru
8b37d89008 am 0552210b: am 91254a02: am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp 
* commit '0552210bfd1b0e1106607dcc79e4e47af0c61493':
  Add --output-text-symbols option to aapt. do not merge.
 2012-09-20 20:28:22 -07:00
Adam Cohen
bae266f03d am 836739a3: am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 
* commit '836739a341f62a93fd115f56c0c3747e9d4e3270':
  Fixing partiallyUpdateAppWidget to cache the new changes
 2012-09-20 20:28:18 -07:00
Irfan Sheriff
360b7d24d1 am 53c6afc9: am 957fadc5: Merge "Use min group owner intent for concurrency" into jb-mr1-dev 
* commit '53c6afc94b05e4aa16bc9768e458481a7ccd66f4':
  Use min group owner intent for concurrency
 2012-09-20 20:28:15 -07:00
Jason Sams
b11710afb3 am d4a6a3e5: am da6f7ab3: Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev 
* commit 'd4a6a3e559dfa705317d25e536f17ff3c313f543':
  Fix aprox fs function names bug b206696
 2012-09-20 20:28:11 -07:00