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

28629 Commits

Author SHA1 Message Date
Daniel Sandler
ac377c849a am 3e78586d: am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '3e78586db6ee28d5052fe9934104dec4c2e87f8b':
  DreamService API revisions.
 2012-10-04 21:03:20 -07:00
Daniel Sandler
3e78586db6 am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '689a55d813a846d7b64f2bf1b6c86d9f9b5bdbea':
  DreamService API revisions.
 2012-10-04 21:01:13 -07:00
Daniel Sandler
689a55d813 am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit 'f5e2b2c26c37d839e6559319d311b62598c6dade':
  DreamService API revisions.
 2012-10-04 20:58:27 -07:00
Daniel Sandler
f5e2b2c26c Merge "DreamService API revisions." into jb-mr1-dev 2012-10-04 20:56:08 -07:00
Daniel Sandler
2d78490292 DreamService API revisions. 
Reduce reliance on Service interface overrides, instead
steering clients to the DreamService-specific lifecycle
hooks:

  onAttachedToWindow .. onDreamingStarted ..
  onDreamingStopped .. onDetachedFromWindow

The old Dream.java is finally gone now too.

Bug: 7281802
Change-Id: Ib7802c3397fde60ad1132fa49831da182eef4d7a
 2012-10-04 23:38:15 -04:00
Dianne Hackborn
438e76f016 am 82e9bd11: am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit '82e9bd113a812ea3507f53469ba7f161532b62ec':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 19:34:09 -07:00
Dianne Hackborn
82e9bd113a am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit 'a9e9eb7026331d4f0ba2fcebeca184df0463b9f2':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 18:21:47 -07:00
Dianne Hackborn
a9e9eb7026 am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit '0cdbd0776d141011567e63158aa0a430362425ef':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 18:20:41 -07:00
Dianne Hackborn
0cdbd0776d Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 2012-10-04 18:19:01 -07:00
Adam Cohen
c5bbd1c6a5 am 451d49b3: am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '451d49b34c8399a3479ca96addcc11857b6afb3e':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:08:36 -07:00
Adam Cohen
451d49b34c am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit 'a39c5c369af24cc25f77b9ac97dfffae41c73eb6':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:05:48 -07:00
Adam Cohen
a39c5c369a am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '327424d69b99213e872e91f05feba2d0a137d6c7':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:03:36 -07:00
Adam Cohen
f752202bee Plumbing to allow keyguard to be shown with user switcher (issue 7175023) 
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService

Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
 2012-10-04 17:53:01 -07:00
Jeff Brown
7952056c71 am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
  Allow phone to go to sleep while in call.
 2012-10-04 17:39:07 -07:00
Jeff Brown
b1e93505ae am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
  Allow phone to go to sleep while in call.
 2012-10-04 17:37:29 -07:00
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
 2012-10-04 17:35:29 -07:00
Dianne Hackborn
33f9cb8cf0 Fix issue #7290206: Need API to get/look up user serial number 
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
 2012-10-04 17:15:10 -07:00
Jeff Brown
93cbbb25a5 Allow phone to go to sleep while in call. 
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
 2012-10-04 16:22:04 -07:00
Jeff Brown
2e65fa2cc3 am 6ac19fe0: am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '6ac19fe0b02c05089e53e380a980b4f646739b30':
  Fix parceling of display info flags.
 2012-10-04 15:33:35 -07:00
Jeff Brown
6ac19fe0b0 am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '4fb5b85a5be88028398e67f37b2d7f802550d9fd':
  Fix parceling of display info flags.
 2012-10-04 15:31:07 -07:00
Adam Powell
0a027ded5f am 5e1b345f: am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '5e1b345f41a01e46e2bddf53e3b0c73b3877333c':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:30:16 -07:00
Adam Powell
5e1b345f41 am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '64f369bbc55a1ca9a88db298dff34fba38c1daae':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:27:47 -07:00
Jeff Brown
4fb5b85a5b am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit 'dce8b948320e933e46e4a38c496f56555472495f':
  Fix parceling of display info flags.
 2012-10-04 15:27:15 -07:00
Adam Powell
64f369bbc5 am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit 'b4fad85ca0ed258e4f8de8045c707a4bf2a6ce66':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:25:36 -07:00
Jeff Brown
dce8b94832 Merge "Fix parceling of display info flags." into jb-mr1-dev 2012-10-04 15:04:21 -07:00
Adam Powell
b4fad85ca0 Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 2012-10-04 15:02:52 -07:00
Jeff Brown
3f2ba6220b Fix parceling of display info flags. 
Bug: 7283429
Change-Id: I5365a3b06d9b9f2414f9a9d2c94b0906c41b4ece
 2012-10-04 14:58:43 -07:00
Adam Powell
f3b8e6fe78 Fix regression in AbsListView CHOICE_MODE_SINGLE 
Earlier patch reversed a few lines of code that allowed deselection of
the currently selected item in CHOICE_MODE_SINGLE. Put it back the way
it was.

Bug 7289436

Change-Id: Ia1c5f3238d2faa3dd79e474851333fda90978d3c
 2012-10-04 14:53:36 -07:00
Dianne Hackborn
8f5a94d938 am a718bc86: am 7df202e2: am 8a229195: Merge "Fix issue #6968859: home not exiting an ANR\'d dream" into jb-mr1-dev 
* commit 'a718bc863aafd21a2bc7240974ca2a51d6af92cf':
  Fix issue #6968859: home not exiting an ANR'd dream
 2012-10-04 12:48:13 -07:00
Dianne Hackborn
a718bc863a am 7df202e2: am 8a229195: Merge "Fix issue #6968859: home not exiting an ANR\'d dream" into jb-mr1-dev 
* commit '7df202e27a34bc1dc8832e4521a2189279de2030':
  Fix issue #6968859: home not exiting an ANR'd dream
 2012-10-04 12:45:23 -07:00
Dianne Hackborn
7df202e27a am 8a229195: Merge "Fix issue #6968859: home not exiting an ANR\'d dream" into jb-mr1-dev 
* commit '8a2291952528303d284878468fe260ec41998db3':
  Fix issue #6968859: home not exiting an ANR'd dream
 2012-10-04 12:43:15 -07:00
Dianne Hackborn
8a22919525 Merge "Fix issue #6968859: home not exiting an ANR'd dream" into jb-mr1-dev 2012-10-04 12:41:41 -07:00
Amith Yamasani
e527e11e81 am ac6c4cbb: am 0cf4c3d4: am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 
* commit 'ac6c4cbb6c961fe89d45bb7a6d8f3465ae495a92':
  Fix launching home when there are multiple launchers installed
 2012-10-04 12:28:54 -07:00
Dianne Hackborn
5fe7e2a304 Fix issue #6968859: home not exiting an ANR'd dream 
Add a new call to the activity manager for the input dispatcher
to report about any pid having an ANR.  This has a new feature
where it can also tell the activity manager that it is above the
system alert layer, so the activity manager can pop its ANR dialog
on top of everything if it needs to.  (Normally we don't want
these dialogs appearing on top of the lock screen.)

Also fixed some debugging stuff here and there that was useful
as I was working on this -- windows now very clearly include
their uid, various system dialogs now have titles so you know
what they are in the window manager, etc.

Change-Id: Ib8f5d29a5572542cc506e6d338599ab64088ce4e
 2012-10-04 12:04:58 -07:00
Amith Yamasani
ac6c4cbb6c am 0cf4c3d4: am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 
* commit '0cf4c3d4a05f68b27895a527af158c976cfc9975':
  Fix launching home when there are multiple launchers installed
 2012-10-04 11:59:55 -07:00
Amith Yamasani
0cf4c3d4a0 am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 
* commit '3364b2ff7970bea9013b53554caf98c2d5f783ed':
  Fix launching home when there are multiple launchers installed
 2012-10-04 11:58:07 -07:00
Amith Yamasani
3364b2ff79 Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 2012-10-04 11:55:28 -07:00
Satoshi Kataoka
feb750e729 am 580bb919: am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit '580bb919ed61d22de018f5cb0df68ae566c01843':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:08:51 -07:00
Satoshi Kataoka
580bb919ed am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'faf45d2525bf64fa7f484cde9180c448fd0e0345':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:06:57 -07:00
Satoshi Kataoka
faf45d2525 am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'ebf7e2851cab55348153fca299c52042b125924d':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:05:12 -07:00
Satoshi Kataoka
ebf7e2851c Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev 2012-10-03 21:02:20 -07:00
Amith Yamasani
203a2f464c Fix launching home when there are multiple launchers installed 
Bug: 7283782

Since ResolverActivity now runs in the correct user, it doesn't need to explicitly
pass in the calling userId. In fact, for the Home case, since ActivityManager is
the one requesting resolution of Home activity, Resolver is running as user 0
instead of the current user.

Removing explicit calls based on the launchingUid fixes the problem.

Change-Id: I4676c155aafaa0dd5cefb1acefa0e7e9c1e20f25
 2012-10-03 20:16:40 -07:00
Christopher Tate
2c7c1dfd56 am 5acd58a7: am d2426a91: am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 
* commit '5acd58a758ad9bb93d59d9d6f1dbe9f516096e3a':
  Use myUserId() only in registerContentObserver()
 2012-10-03 19:01:37 -07:00
Christopher Tate
5acd58a758 am d2426a91: am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 
* commit 'd2426a91f20dcff6a1845a94a7fa914c63d2de5b':
  Use myUserId() only in registerContentObserver()
 2012-10-03 18:59:54 -07:00
Christopher Tate
d2426a91f2 am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 
* commit '1a2fac3eeda031ac5f4c7d17c883d54af5661a66':
  Use myUserId() only in registerContentObserver()
 2012-10-03 18:57:23 -07:00
Christopher Tate
1a2fac3eed Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 2012-10-03 18:54:49 -07:00
Romain Guy
82fa5ffbbc am bf8d8e73: am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 
* commit 'bf8d8e73e4123f529845e88de6d74b62853b9786':
  Fix rendering artifacts on tiled renderers Bug #7275145
 2012-10-03 18:53:48 -07:00
Dianne Hackborn
618c9030db am 85486bd3: am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev 
* commit '85486bd33de1f3665f158df636217166c83199f5':
  Fix issue #7267494, issue #7212347
 2012-10-03 18:52:07 -07:00
Romain Guy
bf8d8e73e4 am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 
* commit '5971d03f233c52d697e55ee83d8e514adac21527':
  Fix rendering artifacts on tiled renderers Bug #7275145
 2012-10-03 18:52:03 -07:00
Dianne Hackborn
85486bd33d am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev 
* commit 'cd09cb8fb79442aa22018db9134ef1ef22059360':
  Fix issue #7267494, issue #7212347
 2012-10-03 18:50:18 -07:00