Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,164 Commits 3 Branches 0 Tags
d6bbf913fea2ae73cec8ff6542a6c7d260dfdddc
Commit Graph

83164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Ng
d6bbf913fe am 97b6f6cf: am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '97b6f6cf9ad5c24e3626b69070e92e36d5173b14':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 17:00:59 -07:00
Peter Ng
97b6f6cf9a am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit 'ab0b9a9e4ec14d556d4c831168e09714c795fa4a':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:58:59 -07:00
Peter Ng
5169a6335f am 6fc1be55: am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '6fc1be557060a1d6c096f066eae958e07b19b73b':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:58:20 -07:00
Peter Ng
6fc1be5570 am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit 'f059e531506da8c053324caa3108a932d72da7b3':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:57:15 -07:00
Peter Ng
ab0b9a9e4e am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '68432f7691085b82096518f47703d59e83cb934d':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150 am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '250da641302aa98c91855f195cc881880aa69172':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:55:08 -07:00
Peter Ng
68432f7691 Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
250da64130 Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 2012-08-13 16:52:38 -07:00
Wink Saville
436f537279 am ee8655c6: am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering" 
* commit 'ee8655c6739cdfb35f192b05d8d4d84402e0d956':
  Fix interface name for tethering
 2012-08-13 16:29:47 -07:00
Wink Saville
ee8655c673 am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering" 
* commit '2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b':
  Fix interface name for tethering
 2012-08-13 16:27:35 -07:00
Wink Saville
2605aeeb30 am b17a583a: Merge "Fix interface name for tethering" 
* commit 'b17a583a3acc57db845993599e4de56e91d5e75a':
  Fix interface name for tethering
 2012-08-13 16:24:15 -07:00
Baligh Uddin
718cfe94fc am 9e1b5846: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9e1b5846d6f85b7e0ea96a65d3cb1fecd0f568d4':
  Import translations. DO NOT MERGE
 2012-08-13 16:10:53 -07:00
Baligh Uddin
9e1b5846d6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-13 16:07:41 -07:00
Kenny Root
24791b3864 am d3d78a67: am 0b4771e0: am 28dba4fc: Merge "Update preloaded-classes for JB" 
* commit 'd3d78a67c48cf8331ff48612a382f244237807d3':
  Update preloaded-classes for JB
 2012-08-13 16:05:31 -07:00
Wink Saville
5af8a7666a am 54d535bd: Merge "Merge commit \'e0df2c4f\' into fix-merge-conflict" into jb-mr1-dev 
* commit '54d535bd57a2873e1e34b7a42cef14ace8e1d694':
  Telephony: Signal Strength cleanup & LTE support
 2012-08-13 16:03:34 -07:00
Kenny Root
d3d78a67c4 am 0b4771e0: am 28dba4fc: Merge "Update preloaded-classes for JB" 
* commit '0b4771e02f77c540f3f198cfadd7ad716901a2b1':
  Update preloaded-classes for JB
 2012-08-13 16:03:14 -07:00
Wink Saville
54d535bd57 Merge "Merge commit 'e0df2c4f' into fix-merge-conflict" into jb-mr1-dev 2012-08-13 16:01:02 -07:00
Baligh Uddin
3bf5d71288 am bc6ee344: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bc6ee3447aea457b3297bb68df5ba053d55adad4':
  Import translations. DO NOT MERGE
 2012-08-13 15:56:20 -07:00
Wink Saville
c1e68d133c Merge commit 'e0df2c4f' into fix-merge-conflict 
* commit 'e0df2c4f':
  Telephony: Signal Strength cleanup & LTE support

Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f
 2012-08-13 15:53:19 -07:00
Baligh Uddin
bc6ee3447a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-13 15:53:15 -07:00
Wink Saville
b17a583a3a Merge "Fix interface name for tethering" 2012-08-13 15:37:09 -07:00
Vishal Mahaveer
a6b6556082 Fix interface name for tethering 
Fix the interface name used in stopTethering

Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-08-13 15:07:24 -07:00
John Spurlock
1e33ce8b43 am 460847c7: Merge "Stop screensaver on incoming phone call." into jb-mr1-dev 
* commit '460847c70d6d7f75addd8cb0ffa091755821c0dd':
  Stop screensaver on incoming phone call.
 2012-08-13 14:37:44 -07:00
John Spurlock
460847c70d Merge "Stop screensaver on incoming phone call." into jb-mr1-dev 2012-08-13 14:34:44 -07:00
Amith Yamasani
167a4ffd06 am b26295b7: Merge "Tests for mapping android name to uid" into jb-mr1-dev 
* commit 'b26295b7a0bc23deb2987c4ff10810c3ce2f1869':
  Tests for mapping android name to uid
 2012-08-13 14:00:48 -07:00
Amith Yamasani
b26295b7a0 Merge "Tests for mapping android name to uid" into jb-mr1-dev 2012-08-13 13:58:32 -07:00
Amith Yamasani
dc09102c8d Tests for mapping android name to uid 
This tests some changes made to bionic.

Change-Id: I7ff8c7f94f6b4bfff64d4e15d4a1a3516a453180
 2012-08-13 13:51:01 -07:00
John Spurlock
7be1a3d67c Stop screensaver on incoming phone call. 
Use notification manager as an indicator of when to stop the screensaver
due to immediately-needed user interaction.

Any notification with a fullScreenIntent will now exit the screensaver.

Bug: 6976796
Change-Id: Id91cd4c32f3fad018b56f4dfe24b37110bab32d8
 2012-08-13 16:45:12 -04:00
Baligh Uddin
3e300c4693 Import translations. DO NOT MERGE 
Change-Id: I95bed23285699c68b623ae0e36600ec5e813db8c
Auto-generated-cl: translation import
 2012-08-13 13:20:03 -07:00
Kenny Root
0b4771e02f am 28dba4fc: Merge "Update preloaded-classes for JB" 
* commit '28dba4fc394f0736e1d7bdf5601382c19c08f518':
  Update preloaded-classes for JB
 2012-08-13 12:00:35 -07:00
Wink Saville
e0df2c4f5d am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support" 
* commit 'eca64977041c5df0c987bdae56006ebbe86de677':
  Telephony: Signal Strength cleanup & LTE support
 2012-08-13 12:00:30 -07:00
Baligh Uddin
038d56254c Import translations. DO NOT MERGE 
Change-Id: Ibf3ae701adc0526c77f0a5327a5ae14d0f01980b
Auto-generated-cl: translation import
 2012-08-13 11:53:55 -07:00
Kenny Root
be62be01ab am 38cc2a5a: am 3221bf27: am 438a0efc: Do not eject internal ASECs when storage unmounted 
* commit '38cc2a5a3ad076fbbb0824a91f49730a4297549b':
  Do not eject internal ASECs when storage unmounted
 2012-08-13 11:45:08 -07:00
Kenny Root
38cc2a5a3a am 3221bf27: am 438a0efc: Do not eject internal ASECs when storage unmounted 
* commit '3221bf27ff6b8eebf360ed2496ad5c56b95fd689':
  Do not eject internal ASECs when storage unmounted
 2012-08-13 11:42:20 -07:00
Kenny Root
28dba4fc39 Merge "Update preloaded-classes for JB" 2012-08-13 11:42:07 -07:00
Kenny Root
3221bf27ff am 438a0efc: Do not eject internal ASECs when storage unmounted 
* commit '438a0efcfbee5dc953e8e5bbdf4cb3dbe94b3f80':
  Do not eject internal ASECs when storage unmounted
 2012-08-13 11:40:10 -07:00
Wink Saville
eca6497704 Merge "Telephony: Signal Strength cleanup & LTE support" 2012-08-13 11:25:49 -07:00
Irfan Sheriff
b3a007be0e am 4d198869: Merge "Add timestamp in scan results" into jb-mr1-dev 
* commit '4d1988699b11a9409015ef38a825d0de841a1d0f':
  Add timestamp in scan results
 2012-08-13 11:24:50 -07:00
Irfan Sheriff
4d1988699b Merge "Add timestamp in scan results" into jb-mr1-dev 2012-08-13 11:22:22 -07:00
Irfan Sheriff
b31f78f937 Add timestamp in scan results 
Propogate 802.11 tsf details per scan result to the applications
and open up hidden access points

BUg: 2961159
Change-Id: I05658fd0cf010c0b36193db3f79422640e8b3a6b
 2012-08-13 11:20:14 -07:00
Jean-Baptiste Queru
21849abc95 am 0f6b0a65: am 82c2ff55: am d7b9c6c3: Merge "Added missing viewport meta tag to html resources" 
* commit '0f6b0a658a0d6e505fef7437f9341d34eb0b3fb9':
  Added missing viewport meta tag to html resources
 2012-08-13 10:58:51 -07:00
Jean-Baptiste Queru
0f6b0a658a am 82c2ff55: am d7b9c6c3: Merge "Added missing viewport meta tag to html resources" 
* commit '82c2ff554682d4d3e99adb8ad4de664bb8a5bce9':
  Added missing viewport meta tag to html resources
 2012-08-13 10:57:02 -07:00
Jean-Baptiste Queru
82c2ff5546 am d7b9c6c3: Merge "Added missing viewport meta tag to html resources" 
* commit 'd7b9c6c356038ebced3461bb098b6a1ea1c7b222':
  Added missing viewport meta tag to html resources
 2012-08-13 10:53:58 -07:00
Kenny Root
438a0efcfb Do not eject internal ASECs when storage unmounted 
If the incoming request is to notify of storage unmounted, don't mess
with apps that are in internal ASECs.

Bug: 6948035
Change-Id: I63ffb895c4d994ee03a5a9bd6bb23f69c88e2a87
 2012-08-13 10:51:09 -07:00
Jean-Baptiste Queru
d7b9c6c356 Merge "Added missing viewport meta tag to html resources" 2012-08-13 10:38:23 -07:00
Jean-Baptiste Queru
bd7cbd440a am d0cfe02b: am 0bf666a8: am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist" 
* commit 'd0cfe02b260b8e8a643abc59cce5a5876d3d44f8':
  mediacodec: Don't crash if trying to open a codec that does not exist
 2012-08-13 09:52:04 -07:00
Kenny Root
1b8e63d446 am 4cfb30a2: am 1ad8bf56: am f0e87175: Merge "Remove useless TestRunner" 
* commit '4cfb30a22ac22ce6a50d4860e467beda5c7da735':
  Remove useless TestRunner
 2012-08-13 09:52:00 -07:00
Jean-Baptiste Queru
d0cfe02b26 am 0bf666a8: am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist" 
* commit '0bf666a875415bae7a1e575eea9b8e5e7762ff3d':
  mediacodec: Don't crash if trying to open a codec that does not exist
 2012-08-13 09:49:51 -07:00
Kenny Root
4cfb30a22a am 1ad8bf56: am f0e87175: Merge "Remove useless TestRunner" 
* commit '1ad8bf5660281d624759897e0403b35b29641ba2':
  Remove useless TestRunner
 2012-08-13 09:49:46 -07:00
Jean-Baptiste Queru
0bf666a875 am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist" 
* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
  mediacodec: Don't crash if trying to open a codec that does not exist
 2012-08-13 09:48:24 -07:00