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

105693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
5ae02e92e4 am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp 
* commit 'eb6403e95d601b62be7b4610599e72fd329f2666':
  Generate SDK docs for v7 support library packages.
 2013-04-26 12:06:15 -07:00
Jeff Brown
eb6403e95d resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp 
Change-Id: I42e15a186561222edd0d97047fcd207208a87282
 2013-04-26 12:04:07 -07:00
Jeff Brown
bfdd256632 Merge "Generate SDK docs for v7 support library packages." into jb-mr2-dev 2013-04-26 18:31:12 +00:00
Wink Saville
65e46420ea am 962b038d: am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 
* commit '962b038d011d06ef8803afaead33ad10ff0133ca':
  Enhance TelephonyManger javadocs.
 2013-04-26 11:25:04 -07:00
Wink Saville
962b038d01 am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 
* commit 'cdeb9cc1decaf23e5ec515b8841d33ecaedb57fd':
  Enhance TelephonyManger javadocs.
 2013-04-26 11:23:02 -07:00
Wink Saville
cdeb9cc1de Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 2013-04-26 18:20:41 +00:00
Baligh Uddin
0eb47f0142 am 3433b6ff: am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '3433b6ff3481d2364e8d727e70bb6fdbd3f139c0':
  Import translations. DO NOT MERGE
 2013-04-26 10:39:05 -07:00
Baligh Uddin
3433b6ff34 am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '5391a2fcb0d1232723ad37d6872bb5800414052f':
  Import translations. DO NOT MERGE
 2013-04-26 10:37:22 -07:00
Baligh Uddin
4f94fd2f9e Merge "Import translations. DO NOT MERGE" 2013-04-26 17:35:52 +00:00
Baligh Uddin
c1458f7963 Merge "Import translations. DO NOT MERGE" 2013-04-26 17:35:00 +00:00
Baligh Uddin
5391a2fcb0 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-26 17:32:25 +00:00
Victoria Lease
7e56c7b8e3 am aae1b516: am b0e0e54d: Merge "Can not mark the same content of browser page after copy" 
* commit 'aae1b5163c319eae31fca509f13ce0a4ea422840':
  Can not mark the same content of browser page after copy
 2013-04-26 10:28:56 -07:00
Victoria Lease
aae1b5163c am b0e0e54d: Merge "Can not mark the same content of browser page after copy" 
* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
  Can not mark the same content of browser page after copy
 2013-04-26 10:27:02 -07:00
Victoria Lease
b0e0e54d9d Merge "Can not mark the same content of browser page after copy" 2013-04-26 17:17:39 +00:00
Irfan Sheriff
e4acc0a5b1 am bafd663f: am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev 
* commit 'bafd663fcdd36042e2340efed835d3fb6d76e3dd':
  Fix network reload when config is restored
 2013-04-26 09:58:57 -07:00
Irfan Sheriff
bafd663fcd am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev 
* commit '4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
  Fix network reload when config is restored
 2013-04-26 09:56:56 -07:00
Irfan Sheriff
4d9431ab35 Merge "Fix network reload when config is restored" into jb-mr2-dev 2013-04-26 16:52:51 +00:00
Svetoslav Ganov
0bd6a395d8 am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 
* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
 2013-04-26 09:40:11 -07:00
Svetoslav Ganov
d385999462 am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 
* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
 2013-04-26 09:38:18 -07:00
Svetoslav Ganov
951ce6c966 Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 2013-04-26 16:35:49 +00:00
Baligh Uddin
7497dee4be Import translations. DO NOT MERGE 
Change-Id: Ia8b07132b35a3e227344420446a09d1c587dab38
Auto-generated-cl: translation import
 2013-04-26 09:13:04 -07:00
Baligh Uddin
389eb34965 Import translations. DO NOT MERGE 
Change-Id: I04ae5b6e5cd229d6e91721f099bda2f483bdaee0
Auto-generated-cl: translation import
 2013-04-26 09:01:51 -07:00
Baligh Uddin
de40bb4570 Import translations. DO NOT MERGE 
Change-Id: I59b1ac894eb47376cc516df18dea34bcc546060d
Auto-generated-cl: translation import
 2013-04-26 08:53:21 -07:00
Jeff Brown
caf7b0a155 Generate SDK docs for v7 support library packages. 
This change required fixing some bugs in how AAPT handles
qualified symbols such as "android:layout_height"
when generating JavaDoc links.  The links were being
generated using the package name of the generated R file
rather than the package name of the referenced symbol.
These broken links caused the JavaDoc build to fail.

Bug: 8175766
Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
 2013-04-26 00:20:42 -07:00
Irfan Sheriff
cca308e3e8 Fix network reload when config is restored 
With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893
 2013-04-25 23:27:19 -07:00
Scott Main
3fc184cf6e am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 
* commit '01e48e7d1541920ece358257e4c2481936497835':
  add docs for new attributes, including account restriction for restricted profiles
 2013-04-25 21:27:06 -07:00
Chris Craik
80246dbdb5 am 57fc8122: am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 
* commit '57fc8122eabc08b19a41f308d409795d094856d8':
  Force clipping on layers that fail to be allocated
 2013-04-25 21:27:04 -07:00
Scott Main
93b7e769eb am 22e9225a: am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 
* commit '22e9225ab13347e3653449af0306bc87fa7965f2':
  fix javadoc build also add some docs to the service
 2013-04-25 21:27:02 -07:00
Amith Yamasani
fe9270712e am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev 
* commit '83a6142173fbd3ddf5c4285e2b6359e44beaddb0':
  Hide isLinkedUser()
 2013-04-25 21:26:59 -07:00
Matthew Xie
6a78365072 am 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 
* commit '7a21c4cdb172f6353cd4166e80910893dc981196':
  Added flush() for bluetooth output stream
 2013-04-25 21:26:56 -07:00
Kristian Monsen
659e804108 am 501bf503: am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 
* commit '501bf503559ff301034e2fb3680b4e046d0ceca5':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
 2013-04-25 21:26:53 -07:00
Scott Main
01e48e7d15 am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 
* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
  add docs for new attributes, including account restriction for restricted profiles
 2013-04-25 21:22:38 -07:00
Chris Craik
57fc8122ea am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 
* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated
 2013-04-25 21:22:35 -07:00
Scott Main
22e9225ab1 am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 
* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service
 2013-04-25 21:22:33 -07:00
Amith Yamasani
83a6142173 am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev 
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
  Hide isLinkedUser()
 2013-04-25 21:22:31 -07:00
Matthew Xie
7a21c4cdb1 am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 
* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream
 2013-04-25 21:22:29 -07:00
Kristian Monsen
501bf50355 am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 
* commit '5866570947a7ef325f74d9dbfc1ccbdd02d3e7b6':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
 2013-04-25 21:22:26 -07:00
Scott Main
22f6a60e62 Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 2013-04-26 03:26:12 +00:00
Chris Craik
addc906f70 Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 2013-04-26 02:15:45 +00:00
Scott Main
b40c1fdaee add docs for new attributes, including account restriction for restricted profiles 
Change-Id: I737ea55bfa58562b1b384e52626e95b479759376
 2013-04-25 19:05:55 -07:00
Scott Main
5e5aeb4684 Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 2013-04-26 01:57:00 +00:00
Amith Yamasani
bbd90f8e70 Merge "Hide isLinkedUser()" into jb-mr2-dev 2013-04-26 01:42:20 +00:00
Matthew Xie
7f3c5d164f Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 2013-04-26 01:18:34 +00:00
Alan Viverette
e7a4e636ac Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597. 
Previously, onHoverEvent() would return true if a view was hoverable
and consume the event. After the change, it would return the result of
dispatchGenericMotionEventInternal(). As a result, touch exploration
caused multiple hover events to be sent from every view under a given
touch point. This change reverts to the original behavior and fixes
touch exploration.

BUG: 8723842
Change-Id: I0c7362f19c51bf21ed842711a03b7f02613958d2
 2013-04-25 17:32:45 -07:00
Nick Kralevich
a4c63e275b am 071c78e0: am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev 
* commit '071c78e0070f4add5b811b1abccc9e6f6f312276':
  Don't set ADDR_COMPAT_LAYOUT on the emulator
 2013-04-25 17:14:36 -07:00
Svetoslav
afab4fd00b am c6eeacd9: am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev 
* commit 'c6eeacd9341c0348c2eb29d1808eb17ea08464f4':
  Lockscreen widgets not always announced.
 2013-04-25 17:14:33 -07:00
Jeff Sharkey
68a13f3df4 am c054d414: am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev 
* commit 'c054d414eeafd5ba226c743626b9a7139bda9425':
  Avoid leaking Surface native object.
 2013-04-25 17:14:31 -07:00
Michael Wright
b31c361077 resolved conflicts for merge of f652551b to master 
Change-Id: I210f0e45d9163a8f5b70f99eba38f343c621a8e7
 2013-04-25 17:09:58 -07:00
Kristian Monsen
5866570947 Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 2013-04-26 00:06:16 +00:00
Jeff Sharkey
60c7acaaf9 Merge "Track foreground activities in battery stats." 2013-04-26 00:02:49 +00:00