Joe Malin
8b3c7d0c8f
am c355a1c1: DOC: Sync Adapters Android Training
...
* commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5':
DOC: Sync Adapters Android Training
2013-07-08 10:17:08 -07:00
Ken Wakasa
02a44f7d47
Revert "Stop marking gamepads as keyboards"
...
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.
Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
2013-07-05 04:08:36 +00:00
Baligh Uddin
8b1529375c
am be432a69: Import translations. DO NOT MERGE
...
* commit 'be432a6983ec479efb211a441e97ce48178b6ebc':
Import translations. DO NOT MERGE
2013-07-03 11:35:16 -07:00
Baligh Uddin
505565c348
Import translations. DO NOT MERGE
...
Change-Id: I5e1ae1aaa21b272c4731ec6f6f8d70a3c909a35a
Auto-generated-cl: translation import
2013-07-03 11:22:24 -07:00
Baligh Uddin
be432a6983
Import translations. DO NOT MERGE
...
Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b
Auto-generated-cl: translation import
2013-07-03 11:20:22 -07:00
Vinit Deshpande
6403663343
am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev
...
* commit 'c2656a98cebab37454c9205b3f4a4ab6afb511a2':
Revert "Temporarily disable 'Scan Always' mode"
2013-07-03 06:44:20 -07:00
quddusc
5a1653425a
am 2a6cbf29: Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev
...
* commit '2a6cbf292fbe9b0ddbee2c867617478a6a1cccc1':
docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348
2013-07-03 06:43:56 -07:00
Vinit Deshpande
c2656a98ce
Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev
2013-07-03 00:12:53 +00:00
Vinit Deshpande
218339818c
Revert "Temporarily disable 'Scan Always' mode"
...
This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.
Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
2013-07-03 00:10:53 +00:00
quddusc
2a6cbf292f
Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev
2013-07-02 22:00:38 +00:00
quddusc
23f004f4c5
docs: Updated uiautomator developer guide documentation for JB MR2 release.
...
Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348
Change-Id: Id81ef4eec7c83ef8bfb8168e82fccc9d002fda99
2013-07-02 14:25:49 -07:00
Wink Saville
db011499c8
am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
...
* commit '753d754c7dbd93a56cd671ee865f2e37ec3d3187':
Fix NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:31:15 -07:00
Baligh Uddin
24a12f67ba
am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '697184b56f918799440bf7749ea8c1e636a63725':
Import translations. DO NOT MERGE
2013-07-02 12:31:12 -07:00
Wink Saville
753d754c7d
Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
2013-07-02 18:17:00 +00:00
Wink Saville
68e6c6452c
Fix NPE if mobile is not supported in checkMobileProvisioning.
...
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
2013-07-02 10:55:14 -07:00
Baligh Uddin
697184b56f
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-07-02 15:59:41 +00:00
Oliver Woodman
9ad7b946fe
am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev
...
* commit '0661dd157f25e3cf8e89dbfe5d871e77e8e3738f':
Expose latency methods through AudioManager and AudioTrack.
2013-07-02 01:31:24 -07:00
Oliver Woodman
0661dd157f
Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev
2013-07-02 08:11:14 +00:00
Baligh Uddin
cdf5ecc8c5
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-07-02 03:53:08 +00:00
Baligh Uddin
178807d590
am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'd6696b7c0b8fdde1cbc9ed5db03126fccef9bb7f':
Import translations. DO NOT MERGE
2013-07-01 20:30:14 -07:00
Baligh Uddin
d6696b7c0b
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-07-02 03:28:52 +00:00
Vinit Deshapnde
9f250e28c3
am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev
...
* commit '93647e2f8f0c1b52d6b8f017096f4f037f9733b9':
Temporarily disable 'Scan Always' mode
2013-07-01 17:56:30 -07:00
Vinit Deshapnde
93647e2f8f
Merge "Temporarily disable 'Scan Always' mode" into jb-mr2-dev
2013-07-02 00:54:19 +00:00
Vinit Deshapnde
c16b0d0061
Temporarily disable 'Scan Always' mode
...
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.
Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
2013-07-01 17:10:28 -07:00
Wink Saville
c45f2e05e3
am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
...
* commit '59046f40baa66d3f10761d8294a43f92feef5c2e':
Add checkMobileProvisioning to ConnectivityService.
2013-07-01 15:39:00 -07:00
Wink Saville
59046f40ba
Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
2013-07-01 22:36:48 +00:00
Oliver Woodman
e64716ad01
Expose latency methods through AudioManager and AudioTrack.
...
There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.
Bug: 9587132
Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
2013-07-01 22:30:18 +01:00
Baligh Uddin
453df32b1b
Import translations. DO NOT MERGE
...
Change-Id: I3ac72382fe871e8259decec6f202119bf9519972
Auto-generated-cl: translation import
2013-07-01 07:35:00 -07:00
Baligh Uddin
daf1ad0ed8
Import translations. DO NOT MERGE
...
Change-Id: I481fb8045084270cfb286b38f46abfdec5c9cd90
Auto-generated-cl: translation import
2013-07-01 07:14:33 -07:00
Baligh Uddin
7dfba282d0
Import translations. DO NOT MERGE
...
Change-Id: I64e7aab52eb9fe13b709d0243d1275b381f3301e
Auto-generated-cl: translation import
2013-07-01 07:12:53 -07:00
Joe Malin
6635e26991
am e9df511e: DOC: Sync Adapters Android Training
...
* commit 'e9df511e2018eb6a296408d09e355c6f2c77ae59':
DOC: Sync Adapters Android Training
2013-06-30 09:17:51 -07:00
Joe Malin
c355a1c156
DOC: Sync Adapters Android Training
...
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
(cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)
2013-06-30 16:16:18 +00:00
Joe Malin
e9df511e20
DOC: Sync Adapters Android Training
...
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
2013-06-29 21:46:59 -07:00
Wink Saville
ab9321d13d
Add checkMobileProvisioning to ConnectivityService.
...
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-06-29 21:10:57 -07:00
Romain Guy
ed96349a43
am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270 " into jb-mr2-dev
...
* commit '3d1b158e705f1ba83ac42dfe1aeaf25201638ef6':
Fix out of range glCopyTexImage2D Bug #9425270
2013-06-28 11:08:21 -07:00
Romain Guy
3d1b158e70
Merge "Fix out of range glCopyTexImage2D Bug #9425270 " into jb-mr2-dev
2013-06-28 18:05:00 +00:00
Amith Yamasani
16a2268f80
am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
...
* commit 'e6304a9c075ed927fc6bdffcc3191dc829f779fa':
When a new user AID is generated, dump it to dropbox
2013-06-28 10:12:21 -07:00
Amith Yamasani
e6304a9c07
Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
2013-06-28 17:08:38 +00:00
Amith Yamasani
5cdf7f5b2a
When a new user AID is generated, dump it to dropbox
...
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
2013-06-28 09:58:43 -07:00
Romain Guy
b254c242d9
Fix out of range glCopyTexImage2D
...
Bug #9425270
A better solution would be to use glCopyTexImage2D whenever possible but
this change would be a little more dangerous.
Change-Id: Ib1aaceda39d838716285ef97f356721416822dbb
2013-06-27 17:15:24 -07:00
Yorke Lee
f6ec304854
am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
...
* commit 'e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a':
Rename Google Talk to Hangouts in framework
2013-06-27 14:50:11 -07:00
Romain Guy
93d46952db
am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
...
* commit '67603c6e1b88fa20db58f69354e3925ffba037d1':
Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:50:08 -07:00
Yorke Lee
e6cb43a1ea
Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
2013-06-27 21:46:19 +00:00
Romain Guy
67603c6e1b
Recreate TextureView's display list on attach
...
Bug #9425270
When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.
The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.
Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
2013-06-27 10:58:10 -07:00
Robert Greenwalt
65f7a95fc4
am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
...
* commit '2f50097a5d5a1fb60574c89c7202cc43ecb51c54':
Fix power issues around wifi scans.
2013-06-26 10:51:35 -07:00
Robert Greenwalt
2f50097a5d
Merge "Fix power issues around wifi scans." into jb-mr2-dev
2013-06-26 17:43:39 +00:00
Robert Greenwalt
8971084258
Fix power issues around wifi scans.
...
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.
bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-26 10:00:16 -07:00
Svetoslav
a0b9e1eead
am 99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
...
* commit '99e4a0f576bad57782b31f1b3329a3d2408f42ae':
Improper initialization of the accessibility manager service.
2013-06-25 14:59:12 -07:00
Svetoslav
99e4a0f576
Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
2013-06-25 21:55:46 +00:00
Joe Malin
6d324c82c6
am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev
...
* commit 'f285a709157b16ed970573988dec603dde89cb11':
Bug 9517413: Activity Detection tutorial has errors
2013-06-24 10:31:40 -07:00