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

87410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
5172316cb2 am a1583288: am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 
* commit 'a1583288aa9e6b740d843b82ccdfd386c8f99455':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
 2012-09-21 12:47:25 -07:00
Craig Mautner
7da20e6be1 am 9f296900: am 9921d842: Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev 
* commit '9f296900d5738761d63f4f0bafbece685911da2e':
  Eliminate potential for NPE in WindowAnimator.
 2012-09-21 12:47:21 -07:00
Chris Craik
bd0eaa088f am 2d85e4b7: am 61d37041: Merge "Polygonal rendering of simple fill shapes" into jb-mr1-dev 
* commit '2d85e4b7f3d60b8fc53450f73290d89cba528354':
  Polygonal rendering of simple fill shapes
 2012-09-21 12:47:13 -07:00
Dianne Hackborn
e5df1ff035 am 09057e45: am 739bc9e3: Merge "Fix issue #7205845: Permissions screen: make "New" text blue instead of red" into jb-mr1-dev 
* commit '09057e450caa292f2b8a2788757aed712db5a36a':
  Fix issue #7205845: Permissions screen: make "New" text blue instead of red
 2012-09-21 12:47:08 -07:00
Romain Guy
7fdf367d7a am 0b697061: am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev 
* commit '0b69706103dc6ddf765fa2e86265a6428f6728bb':
  Update layers in a single batch at the beginning of a frame Bug #7186819
 2012-09-21 12:46:59 -07:00
Bjorn Bringert
5c28267461 am f9173428: am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 
* commit 'f9173428688ce2b6192e72fd70d18ff74cbb34be':
  Add intents to open text and video from search.
 2012-09-21 12:46:50 -07:00
Dan Morrill
9589c79914 am 7c987ca4: am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev 
* commit '7c987ca47cf37af719d05b161e7b516c0dee8740':
  New method returning user metadata.
 2012-09-21 12:45:08 -07:00
Victoria Lease
6f9c01b9c9 am 7c012e03: am 95c942eb: am 4feac670: (-s ours) am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 
* commit '7c012e034cce276209fde7c7fc11ed255832d943':
  Get your own cursor Drawables, WebViewClassic!
 2012-09-21 12:44:34 -07:00
Baligh Uddin
bd025cb399 am d1ef3f49: (-s ours) am 537d47f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd1ef3f49b258456008cefcbe3ab72998bd384286':
  Import translations. DO NOT MERGE
 2012-09-21 12:44:27 -07:00
Daniel Sandler
482f21d60b am eeab8b7f: am ced8d21f: Add string for \'Ethernet\'. 
* commit 'eeab8b7fb3c6eed80da22aa8555debddb6ecb007':
  Add string for 'Ethernet'.
 2012-09-21 12:44:24 -07:00
Daniel Sandler
94b5cd9b37 am 89e27caa: am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 
* commit '89e27caa0cc4a488eaf202c2478204238f95fc0a':
  Add Notification.Builder.setShowWhen(boolean).
 2012-09-21 12:44:19 -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
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
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
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