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

53332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
05c06de73c Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Eric Laurent
759c5b3d49 Fix regression in audio effect factory 
commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection
of problems reported by the engine library upon effect creation.

Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
 2011-06-16 18:28:54 -07:00
Adam Powell
a93347a62e Dialog-o-rama! 
New styling for Holo dialogs. Now 76% easier for apps to create
dialog-based layouts! (Less tricky padding and margin rules)

Cancelable AlertDialogs now are canceled when the user touches
outside.

Dialogs in landscape mode will try not to fill the width of the
screen.

Change-Id: I621b5a19780883ee703a8492510451b480a0b8cc
 2011-06-16 18:20:54 -07:00
Mathias Agopian
b56c8ac8b7 am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:18:47 -07:00
Mathias Agopian
3b916233cb am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:15:19 -07:00
Mathias Agopian
48294b0d93 am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:09:56 -07:00
Daisuke Miyakawa
1515c0b519 Remove HanziToPinin.java 
Those files are moved to ContactsProvider package.

Must be after If786dd286dab47ca1b2ccab38c5fa43ae390c0f7

Bug: 4645142
Change-Id: I774426347e8331fc1c203d5d8e6887e83baffc9f
 2011-06-16 17:42:18 -07:00
Jim Miller
c655ba5e46 Update GridLayout constructors to properly handle DEBUG=true 
This fixes a case where the grid layout debugging wasn't showing.

Change-Id: I28b2754d2d824731e24126300bc501ae2e379ee4
 2011-06-16 17:33:20 -07:00
Mathias Agopian
e7d3ee9d81 Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
 2011-06-16 17:22:28 -07:00
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