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

102434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2ebe777a57 Merge "Import translations. DO NOT MERGE" 2013-03-18 16:21:56 +00:00
Baligh Uddin
8c4d38ec93 Import translations. DO NOT MERGE 
Change-Id: Icda106767529acfdf497b233371e55912ad0e2dd
Auto-generated-cl: translation import
 2013-03-18 09:12:18 -07:00
Lorenzo Colitti
e98b94d590 am caee4f93: am cba45c0e: Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev 
* commit 'caee4f9308965762f9ff9d81b87360dce06de6e8':
  Catch RuntimeException in NMService notifications
 2013-03-18 15:49:12 +00:00
Lorenzo Colitti
caee4f9308 am cba45c0e: Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev 
* commit 'cba45c0eeff6e8f57bec54fbdb89951b5387d14c':
  Catch RuntimeException in NMService notifications
 2013-03-18 15:47:36 +00:00
Lorenzo Colitti
cba45c0eef Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev 2013-03-18 15:45:01 +00:00
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
fb38986e45 am 138c58a9: Merge "Add overlays to views" into jb-mr2-dev 
* commit '138c58a941e624c6a969f874ef2f1da1d04b0132':
  Add overlays to views
 2013-03-18 14:32:54 +00:00
Chet Haase
138c58a941 Merge "Add overlays to views" into jb-mr2-dev 2013-03-18 14:29:06 +00:00
Wink Saville
c7fd2e9f7f am 16489892: am b8c5ce29: Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev 
* commit '1648989280877426b32147d83f0f330e62bd7da1':
  Add new StateMachine constructor with name and handler params.
 2013-03-17 21:33:30 +00:00
Wink Saville
1648989280 am b8c5ce29: Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev 
* commit 'b8c5ce29dcc5b9cd3c644da75b383cee761a02b4':
  Add new StateMachine constructor with name and handler params.
 2013-03-17 21:30:58 +00:00
Wink Saville
b8c5ce29dc Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev 2013-03-17 21:27:19 +00:00
Wink Saville
24d248acdf Add new StateMachine constructor with name and handler params. 
Change-Id: Ic252de6cac24a043050b37d81767d19e2739b2fc
 2013-03-17 14:26:21 -07:00
Chris Craik
9568b5d9f8 am 857c133c: am c8a9fdff: Merge "Reset draw modifiers after flushing" into jb-mr2-dev 
* commit '857c133cded9fcc24cafa4cf59d82c2f4f5953ef':
  Reset draw modifiers after flushing
 2013-03-17 16:28:02 +00:00
Dianne Hackborn
d45bc55fe1 am 6acbd7c6: am bb131f52: Merge "Fix issue #8401553: It\'s possible to startForeground()..." into jb-mr2-dev 
* commit '6acbd7c60a53154af3eb43e7219995c653e5fea4':
  Fix issue #8401553: It's possible to startForeground()...
 2013-03-17 16:27:59 +00:00
Chris Craik
857c133cde am c8a9fdff: Merge "Reset draw modifiers after flushing" into jb-mr2-dev 
* commit 'c8a9fdff4b229b129920aecb1d048d1ff36729b4':
  Reset draw modifiers after flushing
 2013-03-17 16:24:05 +00:00
Dianne Hackborn
6acbd7c60a am bb131f52: Merge "Fix issue #8401553: It\'s possible to startForeground()..." into jb-mr2-dev 
* commit 'bb131f52daf0792c3f1566df992024d5d7640f25':
  Fix issue #8401553: It's possible to startForeground()...
 2013-03-17 16:24:03 +00:00
Lorenzo Colitti
d9b3d55152 Catch RuntimeException in NMService notifications 
Currently, NetworkManagementService only catches RemoteExceptions
when calling the BaseNetworkObserver notification methods (e.g.,
interfaceStatusChanged). However, if the observer is in the same
process, unchecked exceptions can occur as well.

When this happens, finishBroadcast does not get called, and no
further notifications can be sent, because any attempt to do so
fails with a "beginBroadcast() called while already in a
broadcast" exception.

Fix this by catching RuntimeException as well.

Bug: 8397534
Bug: 8276725
Change-Id: Icd6f32128707244978943c48a9ea3a2b952a2957
 2013-03-17 03:21:35 +09:00
Chris Craik
c8a9fdff4b Merge "Reset draw modifiers after flushing" into jb-mr2-dev 2013-03-16 02:09:16 +00:00
Dianne Hackborn
bb131f52da Merge "Fix issue #8401553: It's possible to startForeground()..." into jb-mr2-dev 2013-03-16 01:59:29 +00:00
Chris Craik
d0afeac6df Reset draw modifiers after flushing 
bug:8401910

This avoids leaving the renderer in a state with stale pointers (to,
e.g., shaders or color filters)

Change-Id: Idf8b63657041352e70e34e91ea416fe4385d4bc2
 2013-03-15 18:48:41 -07:00
Dianne Hackborn
282add7bc3 Fix issue #8401553: It's possible to startForeground()... 
...with no visible Notification

Don't allow a 0 icon resource.

Change-Id: I52e93533e6c45c6027ff3c185060cd54d087d077
 2013-03-15 18:48:04 -07:00
Robert Greenwalt
f6f7af47bb am 1218742a: am 2e6ce4f7: am 3fafccdd: am 519ba7b1: Merge "update APN version for MVNO" 
* commit '1218742a112b27fc24df62efe7639978eb8ab1df':
  update APN version for MVNO
 2013-03-16 01:06:14 +00:00
Robert Greenwalt
1218742a11 am 2e6ce4f7: am 3fafccdd: am 519ba7b1: Merge "update APN version for MVNO" 
* commit '2e6ce4f737dcdeb748f467836dd12490c0cdfd22':
  update APN version for MVNO
 2013-03-16 01:03:36 +00:00
Robert Greenwalt
2e6ce4f737 am 3fafccdd: am 519ba7b1: Merge "update APN version for MVNO" 
* commit '3fafccdd180fa9918e900e1176de97cdfec6bccd':
  update APN version for MVNO
 2013-03-15 17:58:57 -07:00
Robert Greenwalt
3fafccdd18 am 519ba7b1: Merge "update APN version for MVNO" 
* commit '519ba7b10c4e0da3586aeeaa9696349f28313898':
  update APN version for MVNO
 2013-03-15 17:56:52 -07:00
Robert Greenwalt
519ba7b10c Merge "update APN version for MVNO" 2013-03-16 00:18:52 +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
0665691376 am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 
* commit 'ab672ba66458e540062f824861303a484d3065fd':
  Revert of Ifd0c4081a.  Turning off logging.
 2013-03-15 23:33:10 +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
5e2552bd16 am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 
* commit 'd468df73d59635aa0f3e0661b84093d02c4c6ca0':
  Fix a bug where we could lose a loader content change.
 2013-03-15 23:12:56 +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
Chris Craik
9c6f0c9567 am 524f12c4: am f40b8a93: Merge "Fully deferred displaylist replay" into jb-mr2-dev 
* commit '524f12c4f82cddc05a9ee633828e3c359cca4f97':
  Fully deferred displaylist replay
 2013-03-15 22:58:46 +00:00
Chris Craik
524f12c4f8 am f40b8a93: Merge "Fully deferred displaylist replay" into jb-mr2-dev 
* commit 'f40b8a939fef0a19b40188f007a3364311d6dabf':
  Fully deferred displaylist replay
 2013-03-15 22:55:54 +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
Chris Craik
f40b8a939f Merge "Fully deferred displaylist replay" into jb-mr2-dev 2013-03-15 22:54:16 +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
08e84b6b7d am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev 
* commit '30527267d12d4338820d4ec2526c6bf81c7f7785':
  Reset reverse state when an animator ends
 2013-03-15 22:52:26 +00:00
Chet Haase
1c9f587582 am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev 
* commit '2de8dac82dfa23f2382a6f6b1f9a2a995ef366eb':
  Log warning when animator detects NaN value
 2013-03-15 22:52:23 +00:00
Chet Haase
e7955865a1 am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 
* commit 'd2e1e4474dbdd87a51a8d75c946d1a027b6655e4':
  Use same default duration (300) for animator resources as for other animators
 2013-03-15 22:52:20 +00: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
kmccormick
29beae6952 am 963d1002: am ec6c2059: am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '963d1002bb462112194fdf7807bab97e08e4b245':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 22:39:21 +00:00
kmccormick
963d1002bb am ec6c2059: am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit 'ec6c2059f99e3d8035ec05be0bf9885dea1f7b35':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 22:36:26 +00:00
kmccormick
ec6c2059f9 am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '3e32923425d20a77f5597af844758de395e69813':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:34:36 -07:00
kmccormick
3e32923425 am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '088aef975808497caf90f03b7eb0a0175d43e01f':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:33:13 -07:00
kmccormick
088aef9758 am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '96a6063943d725c9febc2bc525cb8be648c34fa5':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:31:53 -07:00