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

102455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
e3a30a0305 Merge "Start moving Tasks from DisplayContent to TaskStack" 2013-03-18 19:20:22 +00:00
Dianne Hackborn
468bb47d8f am 0964bb20: am 338b1884: Merge "Improve/flesh-out shared library version check." into jb-mr2-dev 
* commit '0964bb20f4798c9b25334dccbf2c5a14b33e6564':
  Improve/flesh-out shared library version check.
 2013-03-18 18:49:59 +00:00
Dianne Hackborn
0964bb20f4 am 338b1884: Merge "Improve/flesh-out shared library version check." into jb-mr2-dev 
* commit '338b18844434379de54050ff582d36ff6da3ba11':
  Improve/flesh-out shared library version check.
 2013-03-18 18:47:28 +00:00
Dianne Hackborn
338b188444 Merge "Improve/flesh-out shared library version check." into jb-mr2-dev 2013-03-18 18:44:52 +00:00
Chet Haase
6e0651e45f am 24dd6b2d: (-s ours) am 72871325: DO NOT MERGE: ListView transient state fix 
* commit '24dd6b2d9cd12cbca820c395e2c1168150fe34f0':
  DO NOT MERGE: ListView transient state fix
 2013-03-18 18:28:15 +00:00
Chet Haase
24dd6b2d9c am 72871325: DO NOT MERGE: ListView transient state fix 
* commit '728713258ffef4df053b85e0a3488334cbcba24c':
  DO NOT MERGE: ListView transient state fix
 2013-03-18 18:26:26 +00:00
Chet Haase
728713258f DO NOT MERGE: ListView transient state fix 
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.

A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.

Issue #8254775 View.setHasTransient state has side-effects when deleting content in ListView

Change-Id: I2fc25e71ed6655af30b9c3f47fdf014e9b667616
 2013-03-18 10:06:27 -07:00
Baligh Uddin
cf64341ae2 Merge "Import translations. DO NOT MERGE" 2013-03-18 16:52:08 +00:00
Lorenzo Colitti
f990522f70 am 79dcd9ae: am 952e4805: Merge "Framework changes for 464xlat." into jb-mr2-dev 
* commit '79dcd9ae7d35a604e2e62585c8ea247ee485d43b':
  Framework changes for 464xlat.
 2013-03-18 16:47:42 +00:00
Lorenzo Colitti
79dcd9ae7d am 952e4805: Merge "Framework changes for 464xlat." into jb-mr2-dev 
* commit '952e4805f72c0835bbd158051fc56dc64d1d660d':
  Framework changes for 464xlat.
 2013-03-18 16:46:10 +00:00
Baligh Uddin
05543ac7ae Merge "Import translations. DO NOT MERGE" 2013-03-18 16:41:59 +00:00
Lorenzo Colitti
952e4805f7 Merge "Framework changes for 464xlat." into jb-mr2-dev 2013-03-18 16:41:58 +00:00
Baligh Uddin
a16aa918b1 am 87ceab3b: (-s ours) am 14f9fac2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '87ceab3bbce4535dca89134f488441c769a90fa2':
  Import translations. DO NOT MERGE
 2013-03-18 16:40:59 +00:00
Baligh Uddin
87ceab3bbc am 14f9fac2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '14f9fac204a04f74605c79ef38f5345425eea561':
  Import translations. DO NOT MERGE
 2013-03-18 16:39:35 +00:00
Baligh Uddin
3753efd720 Import translations. DO NOT MERGE 
Change-Id: Ie8886ea0022ea1e276655dc57fe927d91c03bafb
Auto-generated-cl: translation import
 2013-03-18 09:39:27 -07:00
Baligh Uddin
14f9fac204 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-18 16:37:35 +00:00
Baligh Uddin
0099f88a35 Import translations. DO NOT MERGE 
Change-Id: I603727bfa9d068f3161e6e4be19121bfc127d674
Auto-generated-cl: translation import
 2013-03-18 09:25:37 -07:00
Baligh Uddin
2ebe777a57 Merge "Import translations. DO NOT MERGE" 2013-03-18 16:21:56 +00:00
Baligh Uddin
b885442820 Import translations. DO NOT MERGE 
Change-Id: I18e0b1bb666d62540c921e8e83508ef6dc3f01af
Auto-generated-cl: translation import
 2013-03-18 09:15:53 -07: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
Craig Mautner
c00204b4d1 Start moving Tasks from DisplayContent to TaskStack 
- Create new classes for Stacks on WindowManager.
- Stop using DisplayContent methods and members:
    addAppToken(),
    removeAppToken(),
    setAppTaskId(),
    removeTask(),
    mTaskIdToDisplayContents,
    mTaskIdToTask.
- Start using WindowManagerService.createTask().
- Establish hierarchy of references: AppWindowToken=>Task=>
TaskStack=>StackBox=>DisplayContent.
- Clean up StackBox, TaskStack, and Task.

Change-Id: I798990aa7966784d22f4a43822087d8bb0404dd6
 2013-03-15 22:44:29 -07: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