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

53167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
1c4438243d am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'e21217af6480c45212517a68b2b6e583c4dc27c9':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 17:20:06 -07:00
John Wang
e21217af64 am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 17:14:28 -07:00
Maarten Hooft
3a3efe7563 am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit '769bf5d59ef1b6a9bce9d64d9761def735d6af65':
  Import revised Croatian translations.
 2011-06-16 17:05:19 -07:00
John Wang
c6b32054c6 am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 16:50:05 -07:00
John Wang
c826f92e6f Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 2011-06-16 16:47:18 -07:00
Dianne Hackborn
46d6bcfb95 Merge "resolved conflicts for merge of 872a1e79 to master" 2011-06-16 16:38:07 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device." 
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
 2011-06-16 16:30:02 -07:00
Fabrice Di Meglio
9171bf3892 Merge "Update BiDiTest app for testing View padding" 2011-06-16 16:20:51 -07:00
Fabrice Di Meglio
b07124082e Update BiDiTest app for testing View padding 
Change-Id: I7b956bd1d16cc4d27f33595f09f14f5d4e17e469
 2011-06-16 16:19:59 -07:00
Svetoslav Ganov
63eeff7427 Merge "Accessiiblity in right state upon connection of a test agent." 2011-06-16 16:15:20 -07:00
Romain Guy
bec9be2f51 Merge "Prevent TweetDeck from crashing." 2011-06-16 16:14:06 -07:00
Romain Guy
5d5d1ff2d5 Prevent TweetDeck from crashing. 
Change-Id: I964d9152010060c3a2698cdb6c22ac21da1af8b0
 2011-06-16 16:13:01 -07:00
Svetoslav Ganov
9dc98e3d17 Accessiiblity in right state upon connection of a test agent. 
1. Enabling accessibility and disabling all enabled
   accessibility service when a test client connects
   the the AccessibilityManagerService.

Change-Id: I2f40cccaa0035ac1454d8c5ac84678c1542a0229
 2011-06-16 16:12:36 -07:00
Dianne Hackborn
a7f88508d3 resolved conflicts for merge of 872a1e79 to master 
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
 2011-06-16 16:01:27 -07:00
Maarten Hooft
769bf5d59e am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit '42781a11ce9e346a24fbb6214f8f214845464213':
  Import revised Croatian translations.
 2011-06-16 15:55:14 -07:00
Maarten Hooft
42781a11ce am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
 2011-06-16 15:48:55 -07:00
RoboErik
29ddc3bc27 Merge "Adds more docs to classes in CalendarContract" 2011-06-16 15:44:08 -07:00
RoboErik
3771fcbc19 Adds more docs to classes in CalendarContract 
Change-Id: I73d93a6a823100394a707e6b85de40fc6e242c03
 2011-06-16 15:41:31 -07:00
Maarten Hooft
d76baeb4d8 Merge "Import revised Croatian translations." into gingerbread 2011-06-16 15:41:20 -07:00
Dianne Hackborn
872a1e793c am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:25:22 -07:00
Dianne Hackborn
9a73c4d3a9 am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:22:10 -07:00
Alex Sakhartchouk
9347d9ad92 Merge "Adding ability to read back fbo data to renderscript" 2011-06-16 15:15:14 -07:00
Irfan Sheriff
e1f9064e35 Fix network state handling 
Change I242cda97 introduced a regression where network state
was being modified on any supplicant state change.

Revert the old behavior of only changeing network detailed state
based on supplicant state change in a disconnected state

Bug: 4690073
Change-Id: I927cc5fa36b862cc54661b033939f543cd15d31f
 2011-06-16 15:02:17 -07:00
Dianne Hackborn
4bd44535fe am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit '810dc5980c504a89974c07fcbd28a2b5dffb47de':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:57:59 -07:00
Dianne Hackborn
810dc5980c am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:55:01 -07:00
Robert Greenwalt
e472fd2b31 am 9bf1a0c3: (-s ours) am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '9bf1a0c3c7e3c26df170519867c5daeee959791e':
  DO NOT MERGE
 2011-06-16 14:54:33 -07:00
Dianne Hackborn
2f04883ff8 SDK only: integrate new sample code, deprecating along the way. 
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
 2011-06-16 14:52:00 -07:00
Robert Greenwalt
9bf1a0c3c7 am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
  DO NOT MERGE
 2011-06-16 14:50:22 -07:00
Dianne Hackborn
f1c5dbbd45 am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit 'abd4dffc86202d48e50bd21807574fa861854dca':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:49:08 -07:00
Dianne Hackborn
abd4dffc86 Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 2011-06-16 14:47:53 -07:00
Robert Greenwalt
62385d5e31 am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
  DO NOT MERGE
 2011-06-16 14:44:57 -07:00
Fabrice Di Meglio
c1f9486a3e Merge "Update getLayoutDirectionFromLocale() for using ICU" 2011-06-16 14:41:50 -07:00
Fabrice Di Meglio
c01924f156 Update getLayoutDirectionFromLocale() for using ICU 
- now relying on ICU.getScript() and ICU.addLikelySubtags() for getting the locale script
- clean unit tests imports

Change-Id: Icdc45fa78490d1e2dde0e83bca0feea8aa205cdf
 2011-06-16 14:40:31 -07:00
Robert Greenwalt
6b93f976c0 Merge "DO NOT MERGE" into honeycomb-mr2 2011-06-16 14:40:25 -07:00
Robert Greenwalt
5a3e91f870 DO NOT MERGE 
backport of change 113518 from honeycomb-LTE.  Fixes NPE in the
statusbar.

bug:4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
 2011-06-16 14:21:04 -07:00
Chet Haase
b47f2f9533 Merge "Fix crash in ViewPropertyAnimator for unparented view." 2011-06-16 14:06:36 -07:00
Xavier Ducrohet
dd9f7750e3 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-06-16 14:04:57 -07:00
Xavier Ducrohet
9340ab4a21 am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit '0be8522b430aca8d90023d7c7e5ef510aa48adc7':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 14:04:18 -07:00
Jeff Sharkey
2242af25df Add permission to fix NetworkPolicy tests. 
Change-Id: I4d5265b2b08c1ec0c42b71ad0ceeb9952094caa0
 2011-06-16 14:03:43 -07:00
Chet Haase
3a000a52d6 Fix crash in ViewPropertyAnimator for unparented view. 
Mechanism for removing possible earlier animations should
call removeCallbacks on the view, not on the (possibly null)
handler of the view.

Change-Id: I76c6f0bea5e009be9197a6e49e9360ed9ef1a9cb
 2011-06-16 14:03:08 -07:00
Xavier Ducrohet
0be8522b43 am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit 'd1abd94f57c0162186c57aea98790e8fa281e0a2':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 13:55:30 -07:00
RoboErik
da67237225 Merge "Add DroidDocs to Events class" 2011-06-16 13:51:16 -07:00
RoboErik
fe37b49dd4 Add DroidDocs to Events class 
Change-Id: I85b14e8a553a1bc160d05a9f076d4aea77e9a39f
 2011-06-16 13:40:02 -07:00
Xavier Ducrohet
d1abd94f57 am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit '04ce81113107d2bfa0b8248b13145b4cf24cb943':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 13:39:31 -07:00
Jeff Sharkey
ad4c9ed7de Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00
Xavier Ducrohet
04ce811131 Bring in more layout lib changes from hc-mr1. 
fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser.

A lot of the init code was duplicated so I made a ParserFactory class.

Also created an extension of the KXmlPullParser to override toString().
This allows easier debugging when dealing with multiple parsers (which
is always the case).

Also added some (disabled) debugging printf to deal with parser stack
as it can be tricky figuring out which parsers are in the stack at
which point.

8969147c : Fix case where the int[] attrs doesn't directly match a styleable.

In the case of the FastScroller the int[] is a custom mix of attr
instead of a int[] that exists as R.styleable.foo.

This makes our reflection based mechanism used to find the styleable
fail, so instead we search for each attribute separately (like
we probably should have done from the beginning).

0c264b35: Fix various cases of getDimension to report error if unit is missing.

if getDimention###() is called for a string that has no unit,
then an error is output through LayoutLog, but the rendering keeps
going by using dp as a default.

0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt()

Only getInt() resolved attribute flags/enum and I'm not sure why
there's two to begin with.
 2011-06-16 13:23:53 -07:00
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
Jeff Sharkey
1a30395358 DownloadManager flags for network policy. 
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
 2011-06-16 13:04:34 -07:00
Robert Greenwalt
4f1f7d3158 am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 
* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
  Reset connections AFTER we take down the network.
 2011-06-16 12:50:46 -07:00
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE 
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
 2011-06-16 12:49:17 -07:00