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

82536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
fb442580d7 am 1103d005: Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev 
* commit '1103d0056c18dda032772df57d9b141b730b7fa0':
  Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
 2012-07-26 20:57:23 -07:00
Matthew Xie
1103d0056c Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev 2012-07-26 20:54:47 -07:00
Matthew Xie
7eb7c3e4c5 am 90a01e6b: am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev 
* commit '90a01e6bd204b1e156e545b577b9782e568b3bee':
  handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
 2012-07-26 20:43:48 -07:00
Matthew Xie
90a01e6bd2 am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev 
* commit 'ab455da3640d462114d2fe58d9c7f816a6663852':
  handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
 2012-07-26 20:41:08 -07:00
Matthew Xie
ab455da364 Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev 2012-07-26 20:38:40 -07:00
Rajeev Sharma
9dda365d8d Add missed line in fisheye.rsh 
Typo fix.  Previously unnoticed as filter was only tested with default image.

Change-Id: I482036cdf78ef660845eca82fb62cf697f5a8eff
 2012-07-26 20:35:44 -07:00
Ravi Nagarajan
82e57fe174 Reset priority on unbond 
Change-Id: I8232c666bde26235ad527c96e5218fc1b3e7a1db
 2012-07-26 19:20:32 -07:00
Swaminatha Balaji
c61eb2617d Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled 
Change-Id: I82d05eacb6c7fae6eb1ebf246d2fce7314ff0a75
 2012-07-26 19:19:51 -07:00
Syed Ibrahim M
305f240dc1 handle NullPointerException in cases where a proxy 
call to AdapterService is called after Adapter
Service is stopped.

Change-Id: I009787f03f9a013b9b06fcb7e3f6241c850f8cd2
 2012-07-26 18:11:23 -07:00
Stephen Hines
21e8f7ae0c Merge "Add fisheye filter to Image Processing benchmark" 2012-07-26 18:02:52 -07:00
Rajeev Sharma
a8477e39a9 Add fisheye filter to Image Processing benchmark 
Add a fisheye filter, mostly based on the GLSL version in
android.filterpacks.imageproc.FisheyeFilter but with the configurable center
functionality from the JNI version in the original PhotoEditor.

Change-Id: I091cba747299809095f6586e16a9221cdc2b2e7d
 2012-07-26 17:58:08 -07:00
The Android Automerger
84f7354e1a merge in jb-mr0-release history after reset to jb-dev 2012-07-26 17:49:40 -07:00
Scott Main
587616a670 am cdd0c59a: docs: add links to new Settings dev guide 
* commit 'cdd0c59a0108036895796dcb2bea69ff5eef26ca':
  docs: add links to new Settings dev guide
 2012-07-26 17:41:01 -07:00
Scott Main
cdd0c59a01 docs: add links to new Settings dev guide 
Change-Id: I04444ec0c4c1c278569b64f15cbbc7e8c1c623cd
 2012-07-26 17:03:51 -07:00
Fabrice Di Meglio
04cef6ff8b am b113ca42: (-s ours) am 0590c1b6: Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev 
* commit 'b113ca42a0104293c486ec194760cf1066bbdd98':
  Make CheckedTextView RTL aware - DO NOT MERGE
 2012-07-26 17:03:04 -07:00
Jason Sams
5a2ec48e5a Merge "Fix readback lengths" 2012-07-26 16:58:47 -07:00
Fabrice Di Meglio
b113ca42a0 am 0590c1b6: Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev 
* commit '0590c1b64f8d73da3ccb582d5a865d4918b40733':
  Make CheckedTextView RTL aware - DO NOT MERGE
 2012-07-26 16:58:10 -07:00
Jason Sams
eadb60fc4f Fix readback lengths 
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
 2012-07-26 16:56:01 -07:00
Fabrice Di Meglio
0590c1b64f Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev 2012-07-26 16:55:59 -07:00
Fabrice Di Meglio
e2386c184a Make CheckedTextView RTL aware - DO NOT MERGE 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Ic647e105571e01e9773e4c27e9f52997d24c408e
 2012-07-26 16:54:06 -07:00
Fabrice Di Meglio
7b3982d11e Merge "Make CheckedTextView RTL aware" 2012-07-26 16:52:56 -07:00
Katie McCormick
836af35ab3 Merge "Doc update: Misc minor GCM updates." 2012-07-26 16:50:58 -07:00
Fabrice Di Meglio
5c795b54b8 Make CheckedTextView RTL aware 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I1479dcf397876e7f4b610812c6c72f069598b3c9
 2012-07-26 16:50:26 -07:00
Katie McCormick
d27c70ab34 Doc update: Misc minor GCM updates. 
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
 2012-07-26 16:30:23 -07:00
Daniel Sandler
4df2c7fa44 Fix NPE on some phones at startup. 
Bug: 6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
 2012-07-26 16:07:43 -07:00
Ying Wang
f237d6475e Merge "Import translations. DO NOT MERGE" 2012-07-26 16:03:28 -07:00
Scott Main
41432a1164 am 133f92f4: am b3716578: am f64e9a8f: am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using clo 
* commit '133f92f452b4800fe29c301170ca95ccea47996d':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:49:57 -07:00
Scott Main
133f92f452 am b3716578: am f64e9a8f: am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage in 
* commit 'b37165782bf20e92cdb5adf14ca9780cabeae2e4':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:47:39 -07:00
Scott Main
b37165782b am f64e9a8f: am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into 
* commit 'f64e9a8fe9e6a75bd217705cd15a72b2dedf00cf':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:45:24 -07:00
Scott Main
f64e9a8fe9 am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev 
* commit '0334538983ee7031bf06c4961ce6185e099ef655':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:43:06 -07:00
Scott Main
0334538983 Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev 2012-07-26 15:40:24 -07:00
Jean-Baptiste Queru
3e9084ebba am 0d6bf8ad: am 33806e25: Remove unnecessary stagefright notices 
* commit '0d6bf8ad969f6705f2cb3594dd1de64e643804e0':
  Remove unnecessary stagefright notices
 2012-07-26 14:55:16 -07:00
Jean-Baptiste Queru
0d6bf8ad96 am 33806e25: Remove unnecessary stagefright notices 
* commit '33806e25b176efb11a5ee8b0f038bfda8f933f0d':
  Remove unnecessary stagefright notices
 2012-07-26 14:53:11 -07:00
Jean-Baptiste Queru
33806e25b1 Remove unnecessary stagefright notices 
They now live in frameworks/media

Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
 2012-07-26 14:10:16 -07:00
Jeff Sharkey
4c628eba48 Split NST handler events away from CS internals. 
Instead of sharing event space, use a different handler backed by
the same looper.

Change-Id: I11f1e4701c341665770ca640f3cba0c295bb7561
 2012-07-26 14:09:09 -07:00
Ying Wang
11fd858a8b Import translations. DO NOT MERGE 
Change-Id: I50220a389a50693e5894c087c7027baf743e8fea
Auto-generated-cl: translation import
 2012-07-26 13:55:40 -07:00
Amith Yamasani
bdf4c0b972 am 753e66c9: am 2b8c4b07: am 6232812a: am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 
* commit '753e66c979c376b11308b07494a520bf24d14183':
  Use correct layout style for Theme.Holo.Light.
 2012-07-26 11:55:30 -07:00
Amith Yamasani
753e66c979 am 2b8c4b07: am 6232812a: am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 
* commit '2b8c4b076d24bc7464e9be63946e8c7bd27bb360':
  Use correct layout style for Theme.Holo.Light.
 2012-07-26 11:53:52 -07:00
Amith Yamasani
2b8c4b076d am 6232812a: am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 
* commit '6232812a8a398b7d1849e1959679010897ef82d2':
  Use correct layout style for Theme.Holo.Light.
 2012-07-26 11:51:06 -07:00
Amith Yamasani
6232812a8a am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 
* commit '61408a7ed230b636263e6c410f62b1932a486ef9':
  Use correct layout style for Theme.Holo.Light.
 2012-07-26 11:49:12 -07:00
Amith Yamasani
61408a7ed2 Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 2012-07-26 11:46:54 -07:00
Irfan Sheriff
0aafef7836 am 8044d68f: am 10d940d9: Fix permission issues for apps 
* commit '8044d68f25e96e1f8ea16bf99d0d695f94273a3a':
  Fix permission issues for apps
 2012-07-26 11:15:43 -07:00
Irfan Sheriff
8044d68f25 am 10d940d9: Fix permission issues for apps 
* commit '10d940d99ff3814cbf4a1b1759a9377b88752f5f':
  Fix permission issues for apps
 2012-07-26 11:13:48 -07:00
Irfan Sheriff
10d940d99f Fix permission issues for apps 
Add a work around and create a bug for proper fix

Bug: 6882233
Change-Id: I342ef7ecade8b9e2c7d16e82ea9031214b1b4462
 2012-07-26 11:09:16 -07:00
Irfan Sheriff
c86353b8b7 Fix permission issues for apps 
Add a work around and create a bug for proper fix

Bug: 6882233
Change-Id: Id372c54dff16aaabc26bedbaced57b906fac825c
 2012-07-26 10:31:45 -07:00
Irfan Sheriff
b6d6e16793 Fix permission issues for apps 
Add a work around and create a bug for proper fix

Bug: 6882233
Change-Id: Id372c54dff16aaabc26bedbaced57b906fac825c
 2012-07-26 09:12:58 -07:00
Adam Cohen
b45ebe1433 am c2483b99: am c58392bc: am a2c99407: am edc14f48: am df5919fd: Merge "Fixing cache pruning to avoid pruning those in the visible range" into jb-dev 
* commit 'c2483b9973a09f6e9de146b77609b1c78f364d40':
 2012-07-26 08:19:55 -07:00
Scott Main
e1cee343dd am 0e1bb8d3: am 61fa1fa8: am 70b43e4f: am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev 
* commit '0e1bb8d3c026ed1aba1f13570dc7a8595b5cf096':
 2012-07-26 08:19:51 -07:00
Jake Hamby
86118f7408 am 063772d4: am 6f65b6ee: am 0c8a7768: am 893d93d2: Implement CMAS service category program results. 
* commit '063772d47f4566ac2d24263831e8aed552427a07':
 2012-07-26 08:19:48 -07:00
Alexander Lucas
ef6e3d5991 am f690d67a: am c56d12e1: am 58ae40ec: am aa9e2c0b: am 11ed0a1f: Merge "Initial commit of GCM lesson for Cloudsync class." into jb-dev 
* commit 'f690d67a6d7cc838445b318b46949bc132e2460f':
 2012-07-26 08:19:44 -07:00