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

86097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Fabrice Di Meglio
eedda1d1c6 am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 
* commit '8da91a699cefccb8d9abf2b72221bc8c1f1874fc':
  Fix bug #7205072 Text inside popup window is too close to the edge
 2012-09-20 20:24:09 -07:00
Jeff Brown
2872e01929 am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev 
* commit 'f2eb2e3e0343da98f8bfe29a6c61d85f1cd7fbd8':
  Fix javadoc.
 2012-09-20 20:24:04 -07:00
Joe Fernandez
4e482b9791 am b4544d68: am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'b4544d68b04b98642a3799207c7a28838c865739':
  docs: Systrace tool documentation
 2012-09-20 20:24:00 -07:00
Jean-Baptiste Queru
0552210bfd am 91254a02: am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp 
* commit '91254a025b984890851d270eadedbf6b0ea3e7db':
  Add --output-text-symbols option to aapt. do not merge.
 2012-09-20 20:23:57 -07:00
Adam Cohen
836739a341 am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 
* commit '11a6450e543d5c178c60ce2216fad1b29bf15457':
  Fixing partiallyUpdateAppWidget to cache the new changes
 2012-09-20 20:23:46 -07:00
Irfan Sheriff
53c6afc94b 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-20 20:23:43 -07:00
Jason Sams
d4a6a3e559 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-20 20:23:39 -07:00
Romain Guy
47becf788c am 596bcc23: Merge "Optimize tiling management Bug #7186819" into jb-mr1-dev 
* commit '596bcc23a7cbf07d1465cfc8caa33b6c87fe6a16':
  Optimize tiling management Bug #7186819
 2012-09-20 20:23:36 -07:00
Mathias Agopian
ad8f23867a 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-20 20:23:32 -07:00
Jeff Brown
0596d2d54f am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev 
* commit 'b4c33679cbdec9e12369fb49469ce33ed83ed25c':
  Disentangle input manager service startup.
 2012-09-20 20:23:29 -07:00
Jeff Brown
d00110c18b 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-20 20:23:25 -07:00
John Reck
45e843304f am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
  Use less static synchronized
 2012-09-20 20:23:22 -07:00
Fabrice Di Meglio
91e44b9607 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-20 20:23:18 -07:00
Eric Laurent
2af4283374 am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev 
* commit '6730c3c69f84d799198365e0692b79be72b0eeb7':
  Fix safe volume warning message flickering
 2012-09-20 20:23:15 -07:00
Zhihai Xu
03a896b6d8 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-20 20:23:11 -07:00
Baligh Uddin
9c0da59fa9 am 2f98008d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2f98008d06cbe48f0f5619d16f59988952c9b2ca':
  Import translations. DO NOT MERGE
 2012-09-20 20:22:27 -07:00
Christopher Tate
820c12c1cb am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
  Multiuser awareness in content observer infrastructure
 2012-09-20 20:22:21 -07:00
Michael Jurka
20c41d5382 Add support for changing status widget on security screen 
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
 2012-09-20 19:19:41 -07:00
Dianne Hackborn
d3724b951e Merge "Don't load views before onResume called." into jb-mr1-dev 2012-09-20 19:13:56 -07:00
Fabrice Di Meglio
8da91a699c Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 2012-09-20 18:51:23 -07:00
Jeff Brown
f2eb2e3e03 Merge "Fix javadoc." into jb-mr1-dev 2012-09-20 18:47:50 -07:00
Fabrice Di Meglio
3e27c34e0e Fix bug #7205072 Text inside popup window is too close to the edge 
- if targetSDK is pre JB-MR1 then we really need to use the User padding
when it is defined and valid

Change-Id: If416fbc181b8784de446e9171529147ab03c9373
 2012-09-20 18:27:17 -07:00
Joe Fernandez
b4544d68b0 am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'c098ff668bf9ff9abd15a2b7352e0c498fa38e3f':
  docs: Systrace tool documentation
 2012-09-20 18:17:51 -07:00
Jean-Baptiste Queru
91254a025b am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp 
* commit 'fea72d3b1a35470489b07f4fd552b3da9f1ad80d':
  Add --output-text-symbols option to aapt. do not merge.
 2012-09-20 18:17:48 -07:00