Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,690 Commits 3 Branches 0 Tags
b02ebb654aba6bf8bd82224a2d0194db93f7de22
Commit Graph

15219 Commits

Author SHA1 Message Date
Costin Manolache
b02ebb654a am f7f46dda: am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb 
* commit 'f7f46dda1e3391661138242be767ecefc15750d2':
  If 'customTokens', let authenticator handle notification.
 2011-01-25 16:22:34 -08:00
Jeff Hamilton
505be50d32 am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.
 2011-01-25 16:21:28 -08:00
Gilles Debunne
ac725e89d2 am f5c7cbad: am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb 
* commit 'f5c7cbadd5a7a53e4e8b79aadde5835dfe907ad0':
  A long press on the selection handle no longer selects the word.
 2011-01-25 16:21:22 -08:00
Dianne Hackborn
17d7cbc14c am a58552e0: am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb 
* commit 'a58552e03de2f24aef735e94fcfab12a0078a3b3':
  Argh forget to include my final part of the change.
 2011-01-25 16:20:16 -08:00
Dianne Hackborn
7f13e47620 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
 2011-01-25 16:19:48 -08:00
Adam Powell
dedeab17b1 am e0c14848: am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 
* commit 'e0c148484e3855bfa48b5e874ac3a1d2663784dd':
  Fix bug 3387855 - Menu flashes on left side of screen
 2011-01-25 16:19:25 -08:00
Jeff Brown
fbe446d7f2 am 391ef42c: am 3168a137: Merge "Fix surface frame size reporting." into honeycomb 
* commit '391ef42c92ab97e5c22a720973790696d30576ca':
  Fix surface frame size reporting.
 2011-01-25 16:18:59 -08:00
Gilles Debunne
277ae7e3dc am 7a417821: am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb 
* commit '7a417821957bac70bfd4cb4a357b143a1a1570e3':
  Fix for a call to startActivity from outside of an app.
 2011-01-25 16:18:51 -08:00
Costin Manolache
f7f46dda1e am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb 
* commit 'b324911b473d20d10c0107273721791bc8b04568':
  If 'customTokens', let authenticator handle notification.
 2011-01-25 16:14:42 -08:00
Costin Manolache
b324911b47 Merge "If 'customTokens', let authenticator handle notification." into honeycomb 2011-01-25 16:13:12 -08:00
Jeff Hamilton
95f7c85499 Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-25 16:02:19 -08:00
Gilles Debunne
f5c7cbadd5 am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb 
* commit '4df103cf3d134bc0e428656e07c43eda2687ecdb':
  A long press on the selection handle no longer selects the word.
 2011-01-25 16:01:37 -08:00
Jeff Hamilton
437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp 
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
 2011-01-25 18:00:41 -06:00
Gilles Debunne
4df103cf3d Merge "A long press on the selection handle no longer selects the word." into honeycomb 2011-01-25 15:59:01 -08:00
Gilles Debunne
874d77c62e A long press on the selection handle no longer selects the word. 
Bug 3371448.

Change-Id: I360e6259f5f58a6f251efbe031ac46a76b7168e7
 2011-01-25 15:29:13 -08:00
Costin Manolache
d606045070 If 'customTokens', let authenticator handle notification. 
Bug: 3377952
Change-Id: Iffb0ed01c39b42838cf88fd1b332c4b41c3194ec
 2011-01-25 15:28:44 -08:00
Dianne Hackborn
a58552e03d am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb 
* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
 2011-01-25 15:25:39 -08:00
Dianne Hackborn
f95bd0feb5 Merge "Argh forget to include my final part of the change." into honeycomb 2011-01-25 15:23:13 -08:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
 2011-01-25 15:19:17 -08:00
Dianne Hackborn
8fca2eccb0 Merge "New extra for GET_CONTENT." into honeycomb 2011-01-25 15:17:50 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT. 
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
 2011-01-25 15:16:55 -08:00
Dianne Hackborn
f812fee071 Argh forget to include my final part of the change. 
Change-Id: I1e2711e1ecde0350047f1edef9a59947ff5749eb
 2011-01-25 14:54:29 -08:00
Adam Powell
e0c148484e am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 
* commit '5dcc9bd7261d6b19135bf972cf603b355b5316f4':
  Fix bug 3387855 - Menu flashes on left side of screen
 2011-01-25 14:50:34 -08:00
Jeff Brown
391ef42c92 am 3168a137: Merge "Fix surface frame size reporting." into honeycomb 
* commit '3168a13723ff0f3f87937457fe33c3518caa4bb9':
  Fix surface frame size reporting.
 2011-01-25 14:48:14 -08:00
Gilles Debunne
7a41782195 am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb 
* commit '47fc854ae9947e0fe5ca0e33e22a41618ba7523b':
  Fix for a call to startActivity from outside of an app.
 2011-01-25 14:48:08 -08:00
Adam Powell
5dcc9bd726 Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 2011-01-25 14:46:47 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread 
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
 2011-01-25 14:41:55 -08:00
Adam Powell
e2b03a62e5 Fix bug 3387855 - Menu flashes on left side of screen 
Post popup menu click events rather than executing inline so that the
popup can close undisturbed.

Change-Id: I01481bd37d7921c10c6b8b484eab33f0d25447ff
 2011-01-25 14:40:36 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs. 
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
 2011-01-25 16:32:26 -06:00
Jeff Brown
3168a13723 Merge "Fix surface frame size reporting." into honeycomb 2011-01-25 14:21:00 -08:00
Gilles Debunne
47fc854ae9 Merge "Fix for a call to startActivity from outside of an app." into honeycomb 2011-01-25 14:20:09 -08:00
Dianne Hackborn
1a728e30ef am a2909773: am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 
* commit 'a29097731254975fdeba8702f3167ef2d14bcdc7':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
 2011-01-25 14:10:42 -08:00
Dianne Hackborn
a290977312 am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 
* commit '4426f643ec3833e830bc2f9b8af5088343de1315':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
 2011-01-25 14:08:10 -08:00
Jaikumar Ganesh
da6e64a6b4 am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 
* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
  Rename virtual call API to ScoUsingVirtualCall.
 2011-01-25 14:07:12 -08:00
Romain Guy
402ede322d am 535602fe: am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 
* commit '535602fe5572e2a648251faf01b4dcd3649d5ede':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
 2011-01-25 14:07:00 -08:00
Dianne Hackborn
4426f643ec Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 2011-01-25 14:06:01 -08:00
Jaikumar Ganesh
e4d494b495 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
 2011-01-25 14:00:32 -08:00
Romain Guy
535602fe55 am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 
* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
 2011-01-25 13:58:08 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Romain Guy
3ac1b0f0d4 Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 2011-01-25 13:55:14 -08:00
Gilles Debunne
bfdb926d83 am a5b43a04: am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb 
* commit 'a5b43a04921711da8fa09b4f30ff5977f8222954':
  Overscoll bounce amplitude is smaller.
 2011-01-25 13:49:40 -08:00
Jaikumar Ganesh
dde68c64fd Rename virtual call API to ScoUsingVirtualCall. 
This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
 2011-01-25 13:49:35 -08:00
Adam Powell
7df04fb2a0 am 41cd1ce1: am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb 
* commit '41cd1ce1b97e48190b47447555560702d0843aba':
  Fix bug 3378333 - Holo-style layout for granting permissions
 2011-01-25 13:47:27 -08:00
Gilles Debunne
a5b43a0492 am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb 
* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
  Overscoll bounce amplitude is smaller.
 2011-01-25 13:47:24 -08:00
Adam Powell
41cd1ce1b9 am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb 
* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
  Fix bug 3378333 - Holo-style layout for granting permissions
 2011-01-25 13:45:19 -08:00
Gilles Debunne
c927ec5049 Merge "Overscoll bounce amplitude is smaller." into honeycomb 2011-01-25 13:44:32 -08:00
Adam Powell
f72a13ec76 Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb 2011-01-25 13:42:49 -08:00
Gilles Debunne
d9ed795ca5 Fix for a call to startActivity from outside of an app. 
Bug 3246715

Regression introduced by https://android-git.corp.google.com/g/#change,86174

Change-Id: Icba170746d196386bd9b0309582f724cb076d937
 2011-01-25 13:40:06 -08:00
Adam Powell
c91466f56a Fix bug 3378333 - Holo-style layout for granting permissions 
Change-Id: Ie1bb925db3ddd8343c9756e220a0d821f4d31c6d
 2011-01-25 13:34:28 -08:00