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

104361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Joe Malin
f285a70915 Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev 2013-06-24 17:15:25 +00:00
Dirk Dougherty
d73e151eac am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '3d1c9b0710efa265e1ead34ee48a487c5ad4f66f':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:42:27 -07:00
Dirk Dougherty
3d1c9b0710 am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit 'eadad05c341b418cfe6249fb16d91951a3432c8a':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:39:52 -07:00
Dirk Dougherty
eadad05c34 am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit 'd8dff038f9368decd5a9e1176e453a24e4309290':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:37:52 -07:00
Dirk Dougherty
d8dff038f9 am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '1c77f5e2757e589bfc8c1e89e6394504f576ac52':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:34:48 -07:00
Dirk Dougherty
1c77f5e275 am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '1c1113958d4e27018b02ce793809d541158440f6':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:32:54 -07:00
Dirk Dougherty
1c1113958d am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '8451fc4f8660842b21e4ed3bddaedb0eb9490855':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:30:58 -07:00
Dirk Dougherty
8451fc4f86 Doc change: edits to education opt-in docs. 
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
 2013-06-24 00:58:04 -07:00
Dirk Dougherty
0efa541a01 am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '6561c27519d710e79a7b2d15e29fcccb2f714c94':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:50:32 -07:00
Dirk Dougherty
6561c27519 am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '6755a4d433d44506abd932b62f6552fa37bf1dd9':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:45:02 -07:00
Dirk Dougherty
6755a4d433 am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '757b943a92d23c255dcca15944908f105265a86b':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:42:58 -07:00
Dirk Dougherty
757b943a92 am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit 'b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:41:29 -07:00
Dirk Dougherty
b2e3fb4f37 am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:39:30 -07:00
Dirk Dougherty
9db291583a am f812258e: Doc change: add docs for edu opt-in. 
* commit 'f812258e5ca9449402781a7330c0e3696f566e09':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:37:14 -07:00
Dirk Dougherty
f812258e5c Doc change: add docs for edu opt-in. 
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
 2013-06-23 19:33:00 -07:00
Scott Main
aa837dedf8 am 86c9d47c: update homepage carousel for jelly bean 3.0 
* commit '86c9d47cb7a1e2b3868e0152f1df9ef335555f52':
  update homepage carousel for jelly bean 3.0
 2013-06-21 20:44:39 -07:00
Scott Main
86c9d47cb7 update homepage carousel for jelly bean 3.0 
Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a
 2013-06-21 20:39:41 -07:00
Scott Main
c2d92db8c0 am bcd6f76a: Merge "typo" into jb-mr2-dev 
* commit 'bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
  typo
 2013-06-21 20:30:12 -07:00
Scott Main
bcd6f76ac9 Merge "typo" into jb-mr2-dev 2013-06-22 03:26:27 +00:00
Scott Main
90e2e8db2f am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev 
* commit '4129cfe1e4abf2366e395f36804a866b13241d28':
  add jb-mr2 api overview
 2013-06-21 20:25:45 -07:00
Scott Main
1c62a0fc32 typo 
Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7
 2013-06-21 20:25:23 -07:00