Commit Graph

4652 Commits

Author SHA1 Message Date
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
2014-10-01 22:36:47 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
2014-10-01 10:14:53 -07:00
Dianne Hackborn
ed1589d81f am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-09-30 20:23:01 +00:00
Dianne Hackborn
9cf01b63cb Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-30 20:18:49 +00:00
Winson Chung
a07d989165 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
2014-09-30 19:41:49 +00:00
Winson Chung
da649073bd Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 2014-09-30 19:16:22 +00:00
Chris Wren
1b4c25fc50 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
2014-09-30 18:55:00 +00:00
Chris Wren
af098c5657 Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 2014-09-30 18:50:05 +00:00
Dianne Hackborn
ce92b0d070 More work on issue #17656716: Unhandled exception in Window Manager
Drop down the limit on when we log, since under normal operation we
will never get more than a few K of data due to strict mode.

Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).

Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
2014-09-30 11:28:18 -07:00
Chris Wren
e6c4893ed4 Update the documentation on EXTRA_PEOPLE.
Include the supported formats with links to ContactsContract documentation.

Bug: 15283556
Change-Id: Ic48b0a9ad1be61f0fa119b1d0e9d6aac5e5bea27
2014-09-30 11:57:03 -04:00
Dianne Hackborn
ccd08f23b0 am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
2014-09-30 14:55:26 +00:00
Dianne Hackborn
73d6a821ae Work on issue #17656716: Unhandled exception in Window Manager
Remove the checks for large parcel sizes.  Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.

Add logging for strict mode IPCs, since those seem to be the
problem.  Only log when things look bad.

Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.

Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
2014-09-29 16:04:02 -07:00
Winson Chung
ae12dae13a Fixing regression with black task bar background. (Bug 17584337)
Change-Id: Ieaa2defa4997ffc8851832c18dfe84e561ffedb5
2014-09-29 15:05:00 -07:00
Fabrice Di Meglio
558e64b39f am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
2014-09-26 21:58:08 +00:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
2014-09-26 13:38:12 -07:00
Jorim Jaggi
2ef12e4a5c am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
2014-09-26 19:43:50 +00:00
Jorim Jaggi
bdd4b201e4 Don't preload task description icons when opening recents
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
2014-09-26 19:00:05 +02:00
Zoltan Szatmary-Ban
fc03ebcbc8 am da833aa6: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
* commit 'da833aa602d59669c3840003b005e8de8168bebe':
  Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 10:03:30 +00:00
Zoltan Szatmary-Ban
bdc07b6986 Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 2014-09-24 09:41:19 +00:00
Zoltan Szatmary-Ban
0bec95d052 Register ActivityManagerService.PackageMonitor for all users.
With the introduction of managed profiles, ActivityManagerService.PackageMonitor
can receive Intents from users other than current one.

Bug: 17580914, 17314317
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
2014-09-23 17:27:17 +01:00
George Mount
18166210eb am 50c7bf74: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit '50c7bf74025fcf3727488e739eeec0ec1092c89b':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:44:59 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +00:00
John Reck
7a5b01bc0e am 01b5cfaa: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit '01b5cfaac7e72526d145b4c5ea706993321abaa9':
  Aggressively trim memory for system_process
2014-09-23 02:52:16 +00:00
George Mount
f1abef6fc2 Force transitioning views to be visible when transition interrupted.
Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
2014-09-22 17:06:24 -07:00
John Reck
73840ea367 Aggressively trim memory for system_process
Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
2014-09-22 16:01:56 -07:00
George Mount
0ca952b197 am 9367ab11: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
* commit '9367ab119e73bbc8d1568b42818ccd248f56cc40':
  Target only shared elements with shared element Transition
2014-09-19 21:24:05 +00:00
George Mount
2deeaa3314 Target only shared elements with shared element Transition
Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
2014-09-19 12:55:20 -07:00
Amith Yamasani
bd59ae2597 am d2484f81: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
* commit 'd2484f8198e11d20eca624b1192cb63d9b78d9ec':
  Allow primary user profile owner to set device restrictions
2014-09-19 16:09:17 +00:00
George Mount
4e049e59f2 am 156e8dd2: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
* commit '156e8dd238af85224df15a80bc43c47bdff3f2ba':
  Fix exception when fragment container has no View.
2014-09-19 16:03:20 +00:00
George Mount
392251f06e am aeebb25c: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev
* commit 'aeebb25c9d29e1768effff0d90df4ec1426554f3':
  Fix NPE when shared element listener is null.
2014-09-19 16:03:15 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Kenny Guy
1167e5b85a am 2481b7f3: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev
* commit '2481b7f34226e11754b933d4d93e101365e859cb':
  Remove suggested key names as its confusing.
2014-09-19 10:06:34 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
George Mount
1732f52895 Fix NPE when shared element listener is null.
Bug 17544867

The shared element listener will be null after the transitions
have been canceled.

Change-Id: Id1182639b44ece27fc267702623641438f9974d5
2014-09-18 15:32:47 -07:00
George Mount
0b26e4d58a Fix exception when fragment container has no View.
Bug 17535259

Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
2014-09-18 15:24:48 -07:00
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
2014-09-18 15:14:26 -07:00
Craig Mautner
bf11570614 am d28e4019: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev
* commit 'd28e40196d3bd5b697be4ed937978ce55f775772':
  Remove activity icon bitmaps from system process.
2014-09-18 21:52:30 +00:00
Craig Mautner
bc3126f859 Merge "Remove activity icon bitmaps from system process." into lmp-dev 2014-09-18 21:25:24 +00:00
Craig Mautner
648f69b95c Remove activity icon bitmaps from system process.
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
2014-09-18 14:16:26 -07:00
Jeff Brown
116e069cdb am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
* commit '6fc160ed30b6d194bbf824c5674403fc622b94f1':
  Create an Application object for the system process.
2014-09-18 20:57:04 +00:00
Kenny Guy
d00cfc51fb Remove suggested key names as its confusing.
Update java doc to not suggest package names
as it confused people into thinking it would
limit access to that package which isn't the
case.

Bug: 15177676
Change-Id: I0736976956d8bb604e5097326c8c4316b3007d64
2014-09-18 16:34:45 +01:00
Jeff Brown
7fc8e357a4 Create an Application object for the system process.
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
2014-09-17 14:19:31 -07:00
George Mount
2716ff8fa7 am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
* commit 'aa386270cf60bb57dfcad5f0b5cded9d4a87b978':
  Fixed OOM due to visibility transitions.
2014-09-15 22:04:49 +00:00
George Mount
6521ebcfdb am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
* commit '9588dada867027b3938ba99b0cacfda7f784c2b7':
  Fixed enter/exit transitions working against shared elements.
2014-09-15 22:04:36 +00:00
George Mount
08ff5c14fe Merge "Fixed OOM due to visibility transitions." into lmp-dev 2014-09-15 18:12:24 +00:00
George Mount
94e7e7ef91 Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 2014-09-15 18:12:13 +00:00