Wink Saville
cc80c0d20b
am 436f5372: am ee8655c6: am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering"
...
* commit '436f5372792d07ed22c6165ec03c0de8ebb16b9e':
Fix interface name for tethering
2012-08-13 16:31:45 -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
2a0b586741
am 718cfe94: (-s ours) am 9e1b5846: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '718cfe94fcaf2a62484bb8c2e26432dcc9bf791b':
Import translations. DO NOT MERGE
2012-08-13 16:12:34 -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
Kenny Root
4c656c6238
am 24791b38: am d3d78a67: am 0b4771e0: am 28dba4fc: Merge "Update preloaded-classes for JB"
...
* commit '24791b3864f1d617c1f0a99bebd9351cc9cd4fb6':
Update preloaded-classes for JB
2012-08-13 16:08:25 -07:00
Baligh Uddin
9e1b5846d6
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-13 16:07:41 -07:00
Wink Saville
16d93471bc
am 5af8a766: am 54d535bd: Merge "Merge commit \'e0df2c4f\' into fix-merge-conflict" into jb-mr1-dev
...
* commit '5af8a7666aa61e8eb12da55c281d9c230596d901':
Telephony: Signal Strength cleanup & LTE support
2012-08-13 16:06:35 -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
82e151db28
Merge "Import translations. DO NOT MERGE"
2012-08-13 16:00:01 -07:00
Baligh Uddin
8eaffbb113
am 3bf5d712: (-s ours) am bc6ee344: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3bf5d712884769365ca6b5321161fdf7f16ec4fb':
Import translations. DO NOT MERGE
2012-08-13 15:58:53 -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
Baligh Uddin
9e6552b9fe
Merge "Import translations. DO NOT MERGE"
2012-08-13 15:51:16 -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
924a953271
am 1e33ce8b: am 460847c7: Merge "Stop screensaver on incoming phone call." into jb-mr1-dev
...
* commit '1e33ce8b434b8ce277ebe1e4e9e4f2b46dc29682':
Stop screensaver on incoming phone call.
2012-08-13 14:39:34 -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
051e46a020
am 167a4ffd: am b26295b7: Merge "Tests for mapping android name to uid" into jb-mr1-dev
...
* commit '167a4ffd06386e08e4a8b1521efe1fafde0993b8':
Tests for mapping android name to uid
2012-08-13 14:02:43 -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
Peter Ng
02123630ca
Multiple design styleguide fixes
...
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed
Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869
Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
2012-08-13 13:22:21 -07:00
Baligh Uddin
8c5689ced0
Import translations. DO NOT MERGE
...
Change-Id: I3f4b360465fb969aa316092a430b861f8912a285
Auto-generated-cl: translation import
2012-08-13 13:21:05 -07: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
Daniel Sandler
08d05e3d1d
New status bar capable of multiple sliding panels.
...
There are some visual glitches but almost everything should
be put back pretty much where it was.
Change-Id: I2f9b0591d44599b07bd83f03c4e09e6dd98e1448
2012-08-13 15:23:51 -04:00
Baligh Uddin
f3124b79af
Import translations. DO NOT MERGE
...
Change-Id: If6567f2759f5de02bdd6a0a47abfa371d54ad40a
Auto-generated-cl: translation import
2012-08-13 12:16:32 -07:00
Baligh Uddin
fc783a17aa
Import translations. DO NOT MERGE
...
Change-Id: Ied1f92d6bb51c1ad20a37760df4fc279efd33f74
Auto-generated-cl: translation import
2012-08-13 12:04:35 -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
ece42ed2f9
am be62be01: am 38cc2a5a: am 3221bf27: am 438a0efc: Do not eject internal ASECs when storage unmounted
...
* commit 'be62be01abb5132deb901d4ac12692e56d76f97c':
Do not eject internal ASECs when storage unmounted
2012-08-13 11:46:12 -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
Irfan Sheriff
6963e0dc0c
am b3a007be: am 4d198869: Merge "Add timestamp in scan results" into jb-mr1-dev
...
* commit 'b3a007be0ed7fdc55b587af7b3a6faa1a032fb41':
Add timestamp in scan results
2012-08-13 11:26:55 -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
2fe50274df
am 21849abc: am 0f6b0a65: am 82c2ff55: am d7b9c6c3: Merge "Added missing viewport meta tag to html resources"
...
* commit '21849abc95ca00b347cbbb53cb78e09ee55c9c7f':
Added missing viewport meta tag to html resources
2012-08-13 11:01:03 -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