Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,428 Commits 3 Branches 0 Tags
cceaf8d80d29879c3ce045b8bed92181aaee9d8e
Commit Graph

24296 Commits

Author SHA1 Message Date
Glenn Kasten
cceaf8d80d am ebd6016b: Merge "Add audio tag to systrace" into jb-dev 
* commit 'ebd6016b8c6faf70b44283c59461023cda1ca6b0':
  Add audio tag to systrace
 2012-05-07 15:48:43 -07:00
Glenn Kasten
ebd6016b8c Merge "Add audio tag to systrace" into jb-dev 2012-05-07 15:45:03 -07:00
Dianne Hackborn
009e6e6b5e am bae365c1: Merge "Fix issue #6319312: Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev 
* commit 'bae365c166538d5c2319bf42aaf1715a1fb749e7':
  Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()...
 2012-05-07 15:14:50 -07:00
Dianne Hackborn
bae365c166 Merge "Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()..." into jb-dev 2012-05-07 15:12:33 -07:00
Dianne Hackborn
755c8bfbff Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()... 
...without onPause() in between

There was a bug in the handling of "always finish activities" where we
would go through destroying activities while in the middle of updating
the activity stack.  This would result in the activity behind the
non-full-screen activity being created and then immediately destroyed,
which things were not expecting.

Change-Id: Idaa89089f7b1af7eb747d7b8f9f394beeb2d23fa
 2012-05-07 15:06:09 -07:00
Jim Miller
07e1f12350 am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit 'a482f942dae90211540c856664ca71ba29297309':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-07 14:51:19 -07:00
Jim Miller
a482f942da Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 2012-05-07 14:48:19 -07:00
Matthew Xie
87d7c1d740 am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit 'ac8a61b6d47e737794b2aaeaf629d87e493413b8':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-07 14:41:41 -07:00
Jim Miller
72b26c1fa2 Fix 6397736: Fix issue with MultiWaveView in incoming call screen. 
This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd
 2012-05-07 14:39:31 -07:00
Matthew Xie
ac8a61b6d4 Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 2012-05-07 14:38:42 -07:00
Jim Miller
8676726dcf am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '06e8d6647db54aa76dda92a5a785737e66d262de':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-07 14:37:39 -07:00
Jim Miller
06e8d6647d Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 2012-05-07 14:34:00 -07:00
Robert Greenwalt
d760beb735 am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit '2321301fe75f945b002372d6d35c597191564452':
  Bring up the ethernet interface when detected
 2012-05-07 13:42:53 -07:00
Robert Greenwalt
2321301fe7 Merge "Bring up the ethernet interface when detected" into jb-dev 2012-05-07 13:39:34 -07:00
Philip Milne
2a52d26c0b am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0':
  Hide optical bounds feature for JB.
 2012-05-07 13:09:14 -07:00
Robert Greenwalt
198bc11d09 Bring up the ethernet interface when detected 
We don't get link status info if it's down.  If the device has been configured
for ethernet and we see the interface appear, we should make it active.

bug:6444395
Change-Id: Ibc233ab12942b069d7db9c0671936798c5161659
 2012-05-07 12:34:26 -07:00
Philip Milne
7bb66c9cae Hide optical bounds feature for JB. 
Change-Id: I1fe38e9c64515acd550baa930ebc0af4c139bf40
 2012-05-07 11:42:57 -07:00
Amith Yamasani
503b2e5ae1 am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '44e3f88f2f80c7dfbe36c22878d129251ba13165':
  Javadoc improvements in SearchView per API review.
 2012-05-07 11:35:47 -07:00
John Reck
462ee95ff0 am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit 'a09b06effff87f9c073cdc7729884adc41286fe1':
  Remove heldMotionless disabling native scroll mode
 2012-05-07 11:35:44 -07:00
Amith Yamasani
44e3f88f2f Merge "Javadoc improvements in SearchView per API review." into jb-dev 2012-05-07 11:33:16 -07:00
John Reck
a09b06efff Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 2012-05-07 11:33:13 -07:00
Gilles Debunne
8779c022b4 am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '0caf421e3aacea928f2ce0e99e101a6584127527':
  Final fix in SpannableStringBuilder.
 2012-05-07 11:22:26 -07:00
Gilles Debunne
0caf421e3a Merge "Final fix in SpannableStringBuilder." into jb-dev 2012-05-07 11:17:38 -07:00
Glenn Kasten
ed853fc4e0 Add audio tag to systrace 
Change-Id: I3c5af7c5d166ff24ef57918a4dbda6327b03cc1f
 2012-05-07 11:05:55 -07:00
Matthew Xie
b12d6bc3a5 When turning off, broadcast STATE_OFF in the last HotOff state 
This is because we do HotOff -> PowerOff -> HotOff for USER_TURN_OFF
Donot do poweroff for perprocess turn off.
Add small time delays for calls into stack to reset dbus timing.
bug 6438556

Change-Id: Iae8bdd24e41824ed4bc34aca96d082f9284f169c
 2012-05-07 11:01:23 -07:00
Selim Gurun
5d13e8ef83 am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit 'ee00b31a54cc186cb53fe30d7834361791baab20':
  Use private key context when necessary
 2012-05-07 10:56:48 -07:00
Selim Gurun
ee00b31a54 Merge "Use private key context when necessary" into jb-dev 2012-05-07 10:54:24 -07:00
Daisuke Miyakawa
12ec18bdb0 am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit 'cacba4599381e7bebbe7aa9e450e3b5baf5fd425':
  Use callable-filter capability when updating call log
 2012-05-07 10:48:28 -07:00
Daisuke Miyakawa
cacba45993 Merge "Use callable-filter capability when updating call log" into jb-dev 2012-05-07 10:46:26 -07:00
Romain Guy
9929b59ac5 am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9d7bbcb89a3f14331c55ed2bbdcf768a4aa91cc1':
  Log more frame data when profiling GL apps
 2012-05-07 10:25:43 -07:00
Romain Guy
9d7bbcb89a Merge "Log more frame data when profiling GL apps" into jb-dev 2012-05-07 10:23:14 -07:00
Romain Guy
a21f877434 Log more frame data when profiling GL apps 
Change-Id: Ib7377c22a2258aa6510677d80df34bb7e73dc714
 2012-05-07 10:20:52 -07:00
John Reck
079623bedf am ff0e8cd8: Merge "Drain any pending touch events immediately if possible" into jb-dev 
* commit 'ff0e8cd8b60aa8372b06edecb2e754b0905c4d31':
  Drain any pending touch events immediately if possible
 2012-05-07 10:07:33 -07:00
John Reck
ff0e8cd8b6 Merge "Drain any pending touch events immediately if possible" into jb-dev 2012-05-07 10:05:00 -07:00
Daniel Sandler
f3fda0778c am fafce1f9: Merge "Add number back to legacy notifications." into jb-dev 
* commit 'fafce1f9f5b371c76cd7875a58b183093f8b517f':
  Add number back to legacy notifications.
 2012-05-07 06:01:00 -07:00
Daniel Sandler
fafce1f9f5 Merge "Add number back to legacy notifications." into jb-dev 2012-05-07 05:58:55 -07:00
satok
0631373d4e am c33208fe: Spell check the first word of the sentence 
* commit 'c33208fe72662fd89b75e996dbd495237a0021d4':
  Spell check the first word of the sentence
 2012-05-07 04:50:09 -07:00
satok
c33208fe72 Spell check the first word of the sentence 
Change-Id: I7803d92de8f4ea399cef5c2d1ddf5396d59ef2cf
 2012-05-07 20:19:18 +09:00
satok
cb9309d04c am 50956b2d: Merge "DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn\'t start when the user changes the cursor position by touch" into jb-dev 
* commit '50956b2dc473126fd04341388df9f244fd22f77e':
  DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch
 2012-05-07 02:35:26 -07:00
satok
50956b2dc4 Merge "DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch" into jb-dev 2012-05-07 02:33:09 -07:00
satok
8589474d26 DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch 
Change-Id: I1535eae23efc42660b9d1e6dbfba6c800b0302b2
 2012-05-07 18:30:17 +09:00
Jim Miller
354619c1cc Fix 6397736: Swipe up to search layout fixes 
This fixes several layout issues on phones and tablets with MultiWaveView.

It adds a new background scrim to be shown behind the MultiWaveView
on the navigation bar.

MultiWaveView is updated to handle gravity constraints which makes layouts
much more flexible across devices.

Change-Id: I64068f4eaa81ef6c464247049117d53432fcacbd
 2012-05-06 22:39:18 -07:00
Adam Powell
1e754e8fac am dad52e15: Merge "Better screen size adaptation for ResolverActivity" into jb-dev 
* commit 'dad52e1500660c72a4defd1c4d1139cb1f90ac7b':
  Better screen size adaptation for ResolverActivity
 2012-05-06 21:01:20 -07:00
Adam Powell
dad52e1500 Merge "Better screen size adaptation for ResolverActivity" into jb-dev 2012-05-06 20:59:11 -07:00
Adam Powell
589e6f960d Better screen size adaptation for ResolverActivity 
Change-Id: I2c982c0b7c722ca7cad46cc23ac8d161bee3a1ff
 2012-05-06 20:53:07 -07:00
Romain Guy
d5fcb10c01 am 8fb62329: Merge "Increase the Message pool size" into jb-dev 
* commit '8fb62329fc6691002c5bb41c67c0ccc977d72adf':
  Increase the Message pool size
 2012-05-06 20:14:00 -07:00
Romain Guy
8fb62329fc Merge "Increase the Message pool size" into jb-dev 2012-05-06 20:11:30 -07:00
Adam Powell
4ffd4b884b am 97621027: Merge "Limit item heights in split action bars" into jb-dev 
* commit '9762102794b90d40d69a9a31aa8cd1538f8151f8':
  Limit item heights in split action bars
 2012-05-06 20:07:07 -07:00
Adam Powell
367ee32605 Limit item heights in split action bars 
Bug 6449422

Overzealous action views should not be able to cause action bars to
take up a huge amount of space.

Fixed text alignment on action buttons

Change-Id: Ic28d6dacdb6933c63b323f5ed6a6cab5d3726938
 2012-05-06 19:54:46 -07:00
Daisuke Miyakawa
e23362a54d Use callable-filter capability when updating call log 
CallerInfo#phoneNumber has a formatted phone number even when contacts
database itself has an unformatted one, so just using Phone.CONTENT_URI
may not be enough to find the relevant contact.

Bug: 6291905
Change-Id: Ie6e40529eb1f9cf98de861601669dbccb718541c
 2012-05-06 19:02:51 -07:00