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

76194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
b86a020c4d am 78e23609: am 7a6a4bf1: Merge "P2p fixes" into jb-dev 
* commit '78e2360950d31b30b5509b481805ebb1e97c9499':
  P2p fixes
 2012-05-02 11:18:45 -07:00
Irfan Sheriff
78e2360950 am 7a6a4bf1: Merge "P2p fixes" into jb-dev 
* commit '7a6a4bf1b5905d3136ca883fff1d432e7c260298':
  P2p fixes
 2012-05-02 11:16:27 -07:00
Irfan Sheriff
7a6a4bf1b5 Merge "P2p fixes" into jb-dev 2012-05-02 11:14:21 -07:00
Adam Cohen
e100fb16a3 am 9edbb235: am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 
* commit '9edbb235779d16e768143f47c241c56a422df580':
  Changing app widget "extras" to "options" and another small API Review issue
 2012-05-02 11:11:14 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
 2012-05-02 11:08:17 -07:00
Adam Cohen
dfed49a285 Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 2012-05-02 10:38:01 -07:00
Matthew Xie
44c727943e am 478b2194: am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev 
* commit '478b2194e3729fc06221e94161e18c2d31884bf1':
  Check null of address in onDeviceCreated
 2012-05-02 10:20:34 -07:00
Matthew Xie
478b2194e3 am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev 
* commit 'e318c9a5f1819e953a2c78b32bced3c7fc427dbf':
  Check null of address in onDeviceCreated
 2012-05-02 10:17:32 -07:00
Matthew Xie
e318c9a5f1 Merge "Check null of address in onDeviceCreated" into jb-dev 2012-05-02 10:15:00 -07:00
Irfan Sheriff
de1e9fa9fb P2p fixes 
- Fix group idle settings
- Fix provision discovery event handling. We only care about device address.
- Fix WPS setup at start

Bug: 6427634
Change-Id: I0b1a7d73199e373350001114f4607bc39f2a53ba
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-05-02 10:02:56 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue 
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
 2012-05-02 09:32:42 -07:00
satok
8d47ec4e80 am c6b93978: (-s ours) am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 
* commit 'c6b939789a8fd3efcac2b71fc2baeb4442fbe1e8':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
 2012-05-02 01:46:16 -07:00
satok
c6b939789a am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 
* commit 'e849230f444653e692024b4321044cb9f6188919':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
 2012-05-02 01:43:17 -07:00
satok
e849230f44 Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 2012-05-02 01:41:23 -07:00
satok
1bc0a49e3c DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition 
Bug: 5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
 2012-05-02 17:30:45 +09:00
satok
fb04fa5ff4 Merge "Reduce window resizing during IME transition" 2012-05-02 01:28:00 -07:00
Adam Powell
53dc75339a am a60ce985: am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev 
* commit 'a60ce9859366b66bcec2a16414abbd670d988de1':
  API modifications for TaskStackBuilder
 2012-05-01 19:17:28 -07:00
Jeff Brown
140651b3a0 am 8802ef02: am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev 
* commit '8802ef02cb2ccb96ef46c9b2d76fa496b484ccfc':
  Use EVIOCSCLOCKID correctly.
 2012-05-01 19:14:43 -07:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev 
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
 2012-05-01 19:14:35 -07:00
Jeff Brown
8802ef02cb am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev 
* commit '69387f432d54f117ea7effa691925a3b918246e4':
  Use EVIOCSCLOCKID correctly.
 2012-05-01 19:11:48 -07:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Jeff Brown
69387f432d Merge "Use EVIOCSCLOCKID correctly." into jb-dev 2012-05-01 19:09:44 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder 
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
 2012-05-01 18:51:40 -07:00
Jeff Brown
92f29230ed am c3cca664: am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev 
* commit 'c3cca66404571454ee13b341925fe45efd5036e6':
  Improve handling of built-in keyboard.
 2012-05-01 18:44:02 -07:00
Jeff Brown
a75fe05b6e Use EVIOCSCLOCKID correctly. 
Bug: 6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
 2012-05-01 18:41:26 -07:00
Jeff Brown
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev 
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
 2012-05-01 18:41:00 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00
Svetoslav Ganov
bbc0f41d40 am 48661a65: am 5a00661b: Accessibility focus should not affect the currently active window. 
* commit '48661a65a945367cfc65cbb4b7b39dd0cec92627':
  Accessibility focus should not affect the currently active window.
 2012-05-01 18:35:02 -07:00
Svetoslav Ganov
48661a65a9 am 5a00661b: Accessibility focus should not affect the currently active window. 
* commit '5a00661bd6a1bfe82656c51d23a3ac6be99602a2':
  Accessibility focus should not affect the currently active window.
 2012-05-01 18:32:05 -07:00
Svetoslav Ganov
5a00661bd6 Accessibility focus should not affect the currently active window. 
1. The event of setting an accessibility focus on a view should not
   make the host window the currently active one.

bug:6400648

Change-Id: Ib45c255f441c38489ee9d4ab5f284550ac5f6b01
 2012-05-01 18:16:20 -07:00
Tsu Chiang Chuang
40b97d4634 Merge "App Compatibility test. Launches a given app and detects crashes or ANRs." 2012-05-01 17:39:22 -07:00
Tsu Chiang Chuang
fea39c3755 App Compatibility test. Launches a given app and detects crashes or ANRs. 
Change-Id: I504868ca2b7785849960be287b8d92ca3055b9ff
 2012-05-01 17:30:09 -07:00
Matthew Xie
02c4b353f7 Check null of address in onDeviceCreated 
address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue  call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug 6338780

Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
 2012-05-01 17:15:10 -07:00
Jeff Sharkey
8c64376bf9 am 7534e4b0: am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev 
* commit '7534e4b0ba85e9027f0a6e192a8dcd9d1699d7fa':
  Catch CCE when migrating to ClipData.
 2012-05-01 16:37:19 -07:00
Jeff Sharkey
7534e4b0ba am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev 
* commit '19eaf0a74dc4521db4c248504ea1815d052c0b27':
  Catch CCE when migrating to ClipData.
 2012-05-01 16:34:54 -07:00
Eric Laurent
50c07796aa am 5518ab06: am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev 
* commit '5518ab0649693e59dc76ed0453629ee7fff324f2':
  AudioManager: deprecate vibrate settings
 2012-05-01 16:34:33 -07:00
Jeff Brown
daa3753a04 Improve handling of built-in keyboard. 
The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field.  We need to be more
careful about distinguishing between built-in and external keyboards.

Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.

Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.

Bug: 6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
 2012-05-01 16:34:20 -07:00
Jeff Sharkey
19eaf0a74d Merge "Catch CCE when migrating to ClipData." into jb-dev 2012-05-01 16:32:38 -07:00
Eric Laurent
5518ab0649 am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev 
* commit 'f3afe15754a3ffbc41955476081c3a29adaf32f3':
  AudioManager: deprecate vibrate settings
 2012-05-01 16:32:20 -07:00
Eric Laurent
f3afe15754 Merge "AudioManager: deprecate vibrate settings" into jb-dev 2012-05-01 16:29:39 -07:00
Philip Milne
4fdae05fdd am 6b36d0d0: am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 
* commit '6b36d0d044964cf133cb2cc6b5b62756d441045f':
  Fix for layout parameter validation bug in GridLayout.
 2012-05-01 16:27:58 -07:00
Eric Laurent
cd1cd73bae AudioManager: deprecate vibrate settings 
Deprecate methods, intent and constants related to vibrate
settings management: getVibrateSetting(), setVibrateSetting(),
shouldVibrate() ...

According to new vibrate/notification policy, applications should
maintain their own vibrate settings.

Issue 6036529.

Change-Id: I99bcef2c5f602131f1d9b0222f7fb39f3bbef823
 2012-05-01 16:26:04 -07:00
Philip Milne
6b36d0d044 am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 
* commit '3e350304599eeb627065de75f3bfe3a45f58389e':
  Fix for layout parameter validation bug in GridLayout.
 2012-05-01 16:24:46 -07:00
Gilles Debunne
6b31eab905 am 6b578dc3: am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev 
* commit '6b578dc30cab9f85d3b111920a1e4390e5482c8a':
  API fix in CheckedTextView
 2012-05-01 16:24:19 -07:00
Gilles Debunne
6b578dc30c am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev 
* commit '61552bc81f9f0c1aacbeec694ff97978050c6182':
  API fix in CheckedTextView
 2012-05-01 16:22:23 -07:00
Philip Milne
3e35030459 Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 2012-05-01 16:21:15 -07:00
Gilles Debunne
61552bc81f Merge "API fix in CheckedTextView" into jb-dev 2012-05-01 16:19:40 -07:00
Chris Craik
a352de1c10 am 272a51d1: am ad759f95: Merge "fix monkey scrolling crash" into jb-dev 
* commit '272a51d1bedfea5c0c27c2b5d34fe8afe55acfa9':
  fix monkey scrolling crash
 2012-05-01 16:08:04 -07:00
Chris Craik
272a51d1be am ad759f95: Merge "fix monkey scrolling crash" into jb-dev 
* commit 'ad759f958a8bd87982b3f34d8424d1ac69c20342':
  fix monkey scrolling crash
 2012-05-01 16:05:01 -07:00
Chris Craik
ad759f958a Merge "fix monkey scrolling crash" into jb-dev 2012-05-01 16:01:58 -07:00