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

28699 Commits

Author SHA1 Message Date
Chet Haase
36350a9592 am fb38986e: am 138c58a9: Merge "Add overlays to views" into jb-mr2-dev 
* commit 'fb38986e452a51b6ce37131f293316adedc75ff0':
  Add overlays to views
 2013-03-18 14:34:57 +00:00
Chet Haase
138c58a941 Merge "Add overlays to views" into jb-mr2-dev 2013-03-18 14:29:06 +00:00
Robert Greenwalt
03fd756f2a am 06656913: am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 
* commit '0665691376c3df35e55e8f2b72d674ccaa948a9d':
  Revert of Ifd0c4081a.  Turning off logging.
 2013-03-15 23:36:02 +00:00
Robert Greenwalt
ab672ba664 Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 2013-03-15 23:30:59 +00:00
Dianne Hackborn
1545d7c5f7 am 5e2552bd: am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 
* commit '5e2552bd16ae09da826270363ac0f3f56af91922':
  Fix a bug where we could lose a loader content change.
 2013-03-15 23:14:17 +00:00
Dianne Hackborn
d468df73d5 Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 2013-03-15 23:10:47 +00:00
Chet Haase
cbd449e2e6 am 08e84b6b: am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev 
* commit '08e84b6b7d6a7eb6f14a731767caafecb78238e6':
  Reset reverse state when an animator ends
 2013-03-15 22:55:17 +00:00
Chet Haase
55161629f5 am 1c9f5875: am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev 
* commit '1c9f587582c584958af2d78bbc76a7dac9f2c6fc':
  Log warning when animator detects NaN value
 2013-03-15 22:55:14 +00:00
Chet Haase
b966327170 am e7955865: am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 
* commit 'e7955865a17e3065bcaf56fa57bec0346ecc8d21':
  Use same default duration (300) for animator resources as for other animators
 2013-03-15 22:55:12 +00:00
Chet Haase
91cedf1c3d Add overlays to views 
It is useful, particularly in animations, to be able to add a view, or at
least some graphics, on top of a view. For example, to have a child of a layout
fade away, we might want to remove the child from that layout and then fade it out
gradually. Meanwhile, we have to have a place to put that view where it will be
drawn. We could do this in the content container sometimes, but this is not a
reliable workaround in the general case, and may obscure other siblings/parents of
the layout/view in the hierarchy. A better approach would be to place a view/graphic
temporarily in the layout itself.

This feature adds the ability to add one or more Views and Drawables to an "overlay"
layer, after which the view will handle drawing that extra content when it redraws itself.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I70bf78c46ee3db8bd87ea1cdc2ecb5c0747ccbf9
 2013-03-15 15:53:31 -07:00
Chet Haase
30527267d1 Merge "Reset reverse state when an animator ends" into jb-mr2-dev 2013-03-15 22:51:07 +00:00
Chet Haase
2de8dac82d Merge "Log warning when animator detects NaN value" into jb-mr2-dev 2013-03-15 22:50:51 +00:00
Chet Haase
d2e1e4474d Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 2013-03-15 22:50:06 +00:00
Jeff Sharkey
47d07fde90 am 20a1cf34: am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 
* commit '20a1cf345f5f7952677d5f9cd97efe1a9a197930':
  Avoid warnings about synthesized IDs.
 2013-03-15 21:51:29 +00:00
Jeff Sharkey
93b04b91bc Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 2013-03-15 21:47:58 +00:00
Jeff Sharkey
47b50333c1 Avoid warnings about synthesized IDs. 
Bug: 8153518
Change-Id: I5d638e17581f63c6d4a10ff6bc2c1bf9997a78b3
 2013-03-15 14:46:52 -07:00
Chet Haase
d9e4a5c2e5 Use same default duration (300) for animator resources as for other animators 
Issue #7492926 Animator resources should use same default duration as code-created Animators

Change-Id: I337a2c37ff26ebb6cb8b2fb2b58523c464af518b
 2013-03-15 14:33:24 -07:00
Chet Haase
2076316ce1 Log warning when animator detects NaN value 
Issue #8350458 Add exception to Animators when NaN detected

Change-Id: I926c3f35b661b0bb1d9e3c7c0df55e7513734589
 2013-03-15 13:50:54 -07:00
Fabrice Di Meglio
f72b5c920a am cf60cc9a: am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 
* commit 'cf60cc9adedf032c6c97cd2cbb9ff211deaaf3ae':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
 2013-03-15 20:39:31 +00:00
Fabrice Di Meglio
261f82ca99 Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 2013-03-15 20:34:06 +00:00
Robert Greenwalt
1afb71377c Revert of Ifd0c4081a. Turning off logging. 
Found our bug, so switching the logging back off.
bug:8377625

Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5
 2013-03-15 20:20:11 +00:00
Chet Haase
caf46486f5 Reset reverse state when an animator ends 
Seeking an animation after the animator has reverse()'d to the beginning
will result in seeking in reverse. Starting the animation will make it proceed
normally, and calling reverse() will also give expected behavior. But seeking
causes this unexpected behavior because the state of reversing is not reset until
the next time the animation is played (either by start() or reverse()).

Fix is to reset the internal flag when the animator ends.

Issue #8234676 Reversing an Animator Leaves it in A Reversed State Until Explicitly Started

Change-Id: I9d212ae1879aa277d1add7eb4c7ec61432af059e
 2013-03-15 13:04:42 -07:00
Robert Greenwalt
49cfb16e2a am 8e338c91: am 1b364498: Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 
* commit '8e338c9106c19b984456192bf885bac9bdf48717':
  Revert "Turn on more logging to find this bug."
 2013-03-15 19:25:55 +00:00
Robert Greenwalt
1b36449830 Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 2013-03-15 19:19:46 +00:00
Robert Greenwalt
15dd5be47e Revert "Turn on more logging to find this bug." 
This reverts commit bb5bcaaaed37e6215f5f253d968afcb10c1b2f3d
bug:8377625
Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
 2013-03-15 19:19:24 +00:00
Robert Greenwalt
1b8c2c718b am bfbd6385: am 868adf73: Merge "Don\'t return an unmod collection." into jb-mr2-dev 
* commit 'bfbd638595f853ea02157d9b0a6b043ae6146d24':
  Don't return an unmod collection.
 2013-03-15 19:18:01 +00:00
Robert Greenwalt
868adf7369 Merge "Don't return an unmod collection." into jb-mr2-dev 2013-03-15 19:13:47 +00:00
Craig Mautner
d99b26285d am 20a402e0: am 8dfe99ce: Merge "Catch BadTokenException and continue." into jb-mr2-dev 
* commit '20a402e0dc8d3052ac317e6c13afee22a9502c35':
  Catch BadTokenException and continue.
 2013-03-15 19:04:20 +00:00
Craig Mautner
8dfe99ce20 Merge "Catch BadTokenException and continue." into jb-mr2-dev 2013-03-15 18:59:51 +00:00
Craig Mautner
e4bbb1cc45 Catch BadTokenException and continue. 
BadTokenException is a normal consequence of swapping IMEs while there
is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This
race condition cannot be avoided without an unacceptable lock down of
InputMethodManagerService.

Fixes bug 8387663.
Fixes bug 8263462.

Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
 2013-03-15 11:38:44 -07:00
Robert Greenwalt
6629bcd660 Don't return an unmod collection. 
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:8398355

Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922
 2013-03-15 11:28:50 -07:00
Fabrice Di Meglio
da12f389eb Revert "Clean Paint.mBidiFlags as it is no longer used" 
This reverts commit 6d9fe5bd22b531bfce69b146254a4791c76acddc.
 2013-03-15 11:26:56 -07:00
Lorenzo Colitti
e33ec6e9a6 am c09d7cbf: am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev 
* commit 'c09d7cbf2b5d590b39ff2282d6e3c9f1d971dd01':
  Don't update routes if Dhcp fails.
 2013-03-15 18:14:42 +00:00
Robert Greenwalt
28cdf1dc22 Don't update routes if Dhcp fails. 
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
 2013-03-15 10:48:46 -07:00
Lorenzo Colitti
51bbb5cb93 am beb9dfaa: am 827ef6e0: Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 
* commit 'beb9dfaa1c6d7586f26f49ae4a4cbfaed49b4991':
  Add stacking to the NetworkStateTrackers.
 2013-03-15 17:16:48 +00:00
Lorenzo Colitti
4359c23873 am 3a2eb126: am 8d0e2618: Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 
* commit '3a2eb126ad342d6aa02c79646b9364e5369ed21c':
  Add stacked interfaces to LinkProperties.
 2013-03-15 17:16:45 +00:00
Lorenzo Colitti
827ef6e0bd Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 2013-03-15 17:11:30 +00:00
Lorenzo Colitti
8d0e261849 Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 2013-03-15 17:09:00 +00:00
Chet Haase
d370c54801 am c584f7f4: am b38258f3: Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 
* commit 'c584f7f44e4629e97e662e66f2a135ddb426fc7a':
  Fix erroneous requestLayout-during-layout issues
 2013-03-15 14:34:02 +00:00
Chet Haase
b38258f357 Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 2013-03-15 14:29:41 +00:00
Lorenzo Colitti
69edd64d9b Add stacking to the NetworkStateTrackers. 
Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
 2013-03-15 14:35:35 +09:00
Lorenzo Colitti
419a4ce9e4 Add stacked interfaces to LinkProperties. 
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
 2013-03-15 14:35:32 +09:00
Dianne Hackborn
ca614f78be Fix a bug where we could lose a loader content change. 
If AsyncTaskLoader starts a background update due to a
content change, and that update is cancelled, we drop the
data when it finally arrives and forget that the content changed.
If we later come back to the loader, we then end up showing
stale data because we don't know that we still need to update
due to the old content change.

This change adds a couple new APIs to Loader to deal with the
time between when you ask for whether there is a content change
and finally either commit the data or cancel the update.
AsyncTaskLoader is changed to make use of this so that it doesn't
lose changes.

Change-Id: I3866236b1c22bb9138f2d9f6032b126aeaee2e6e
 2013-03-14 19:17:00 -07:00
Jeff Sharkey
e7a4e42d3d am 49ca328f: am debbeec5: Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev 
* commit '49ca328fc0c3bdb090b323e5bae23bfb696e6099':
  Move deleteOlderFiles() to framework, tests.
 2013-03-14 22:10:40 +00:00
Jeff Sharkey
debbeec575 Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev 2013-03-14 22:06:15 +00:00
Jeff Sharkey
d9526907d1 Move deleteOlderFiles() to framework, tests. 
Supports both age and count based constraints.  Added light docs and
tests to verify behavior.

Bug: 8387555
Change-Id: If4d0dac8bc54ce705c2a339bc09a60ea748728b8
 2013-03-14 15:04:12 -07:00
Fabrice Di Meglio
14506d8b73 am fc8865d8: am b1b58023: Merge "Code BidiFormatter code" into jb-mr2-dev 
* commit 'fc8865d8ccb22797dc571055c463f871bdf80665':
  Code BidiFormatter code
 2013-03-14 21:57:18 +00:00
Fabrice Di Meglio
b1b58023ba Merge "Code BidiFormatter code" into jb-mr2-dev 2013-03-14 21:52:05 +00:00
Irfan Sheriff
fd5c559d63 am 370d3904: am 11aefad9: Add support for scan always available mode 
* commit '370d3904f7f3360f7e2aa637795d197c84924886':
  Add support for scan always available mode
 2013-03-14 21:36:33 +00:00
Irfan Sheriff
11aefad94d Add support for scan always available mode 
Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.

Bug: 8141918

Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
 2013-03-14 13:55:56 -07:00