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

86125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
e8910d3b78 am 3ed6f945: Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023) 
* commit '3ed6f9456a60cb3a2cf4166a7fa19e30b9bbd972':
  Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
 2012-09-21 12:14:10 -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
Romain Guy
a1583288aa am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 
* commit '4187f928921bab6a77e8b6592131f2a2b02ac0a3':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
 2012-09-21 11:22:56 -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
9f296900d5 am 9921d842: Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev 
* commit '9921d842bb2654fd354612f5637c8a248bdb299f':
  Eliminate potential for NPE in WindowAnimator.
 2012-09-21 11:19:54 -07:00
Craig Mautner
9921d842bb Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev 2012-09-21 11:17:51 -07:00
Chris Craik
2d85e4b7f3 am 61d37041: Merge "Polygonal rendering of simple fill shapes" into jb-mr1-dev 
* commit '61d37041ac76a95aedb98d3550bb5efa33d898a1':
  Polygonal rendering of simple fill shapes
 2012-09-21 11:06:08 -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
09057e450c am 739bc9e3: Merge "Fix issue #7205845: Permissions screen: make "New" text blue instead of red" into jb-mr1-dev 
* commit '739bc9e3f51c203fc0b58c30d67cacda985e95c6':
  Fix issue #7205845: Permissions screen: make "New" text blue instead of red
 2012-09-21 11:01:22 -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
0b69706103 am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev 
* commit '3f7c246f3ea85af9fb98cba37387bb55658d4614':
  Update layers in a single batch at the beginning of a frame Bug #7186819
 2012-09-21 10:52:20 -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
Bjorn Bringert
f917342868 am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 
* commit '45b07b9427cc736bf4fd5658ef2f30884ba4d9a4':
  Add intents to open text and video from search.
 2012-09-21 10:37:15 -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
7c987ca47c am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev 
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
  New method returning user metadata.
 2012-09-21 09:57:16 -07:00
Dan Morrill
466bd63681 Merge "New method returning user metadata." into jb-mr1-dev 2012-09-21 09:53:57 -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
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
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
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
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
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
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
Dan Morrill
e4ab16ad98 New method returning user metadata. 
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
 2012-09-20 20:25:55 -07:00
Dianne Hackborn
e40950d78c am d3724b95: Merge "Don\'t load views before onResume called." into jb-mr1-dev 
* commit 'd3724b951e1fdd48bd5accc29e5dff2102efdf3e':
  Don't load views before onResume called.
 2012-09-20 20:24:12 -07:00