Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,067 Commits 3 Branches 0 Tags
5b64ec74396c09cd2c91c32d695cd9499c2b9cbe
Commit Graph

4916 Commits

Author SHA1 Message Date
Christopher Tate
5d12de3e4a am 6f6dd6ed: am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '6f6dd6edacc5b86604d3276ee710996bcb980a3a':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:12:39 +00:00
Christopher Tate
6f6dd6edac am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '1d647ab5591ff58796868513edc62050c99b6541':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:01:53 +00:00
Christopher Tate
61eae1605d am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:48:24 +00:00
Christopher Tate
004c16654f Tweak wallpaper restore acceptance heuristics 
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
 2014-10-02 14:27:09 -07:00
Craig Mautner
ce324a2da7 am bee6dfe0: am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit 'bee6dfe09d4381f9ddf666fd04012c662f31e7fd':
  Don't clear visible-behind activity if it is top
 2014-10-02 02:00:41 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:58:34 +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
Dianne Hackborn
42b7a45a56 am 67787a82: am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '67787a82a01460f0d68c154fdf3045bdc1ee572f':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:18:29 +00:00
Winson Chung
b209a9cd15 am 07f9306e: am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit '07f9306ef47c2067cbb5ae776ce9738b0aca3cd9':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:18:18 +00:00
Chris Wren
445fff144d am 8bac9b5a: am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '8bac9b5a6e41ad1b987ed66d255172d77d7e62a0':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:18:09 +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
67787a82a0 am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:10:04 +00:00
Winson Chung
07f9306ef4 am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:09:51 +00:00
Chris Wren
8bac9b5a6e am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'ca20e6c637c34a1200f08b2de5485193bc4eb74c':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:09:43 +00:00
Dianne Hackborn
16b6a8f702 am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:15:07 +00:00
Winson Chung
d1c1201dfc am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:14:56 +00:00
Chris Wren
1d88c087e6 am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '4afe428f49533342966545a14b51acaee9052c71':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 15:14:49 +00:00
Dianne Hackborn
a0767b3652 am f9cd6fa5: am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'f9cd6fa5a34a9ba22eaa47d8c5f9c39b5cd901a2':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 02:14:37 +00:00
Dianne Hackborn
f9cd6fa5a3 am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'bb527c59d1fb0ad627f44cbb378959fa7d4af2c7':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 01:42:37 +00:00
Dianne Hackborn
e26ba8f74f am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:58:52 +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
da649073bd Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 2014-09-30 19:16:22 +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
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
507aeb0972 am 1acd81fb: am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '1acd81fbcc980ef17711a3472b7f0d0e3d5e34c4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-29 19:45:33 +00:00
Fabrice Di Meglio
1acd81fbcc am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '33512668429e480f0c80b3e60adae43230065184':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:53:00 +00:00
Jorim Jaggi
9984c1b45c am eddc4b18: am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit 'eddc4b18899498c3cf6d535c79020e030f7f7eb6':
  Don't preload task description icons when opening recents
 2014-09-26 21:03:56 +00:00
Fabrice Di Meglio
a552e9846a am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:01:47 +00:00
Jorim Jaggi
69c0943e43 am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5011153937fdb0fbbb7d75e09204370c2aeed00a':
  Don't preload task description icons when opening recents
 2014-09-26 20:52:43 +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
b56ec7fc26 am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
  Don't preload task description icons when opening recents
 2014-09-26 19:52:56 +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
George Mount
2755745a9e am 0a55edde: am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '0a55eddeaec857c408c6a5ada58d8aeb70e1f4da':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:57:21 +00:00
George Mount
da083bfd03 am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '028332e93e885d260c6214ca14e02035242c8dfe':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:49:33 +00:00
George Mount
c9a5227292 Fix NPE when detached View is added as a shared element. 
Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
 2014-09-24 12:39:08 -07:00
Zoltan Szatmary-Ban
e1fe008b5a am 2ee27770: am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 
* commit '2ee27770fac1bd74f88ab80a1b2b962489c4f52a':
  Register ActivityManagerService.PackageMonitor for all users.
 2014-09-24 17:18:42 +00:00
Zoltan Szatmary-Ban
f168023d82 am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 
* commit '5ba8cb8aaafd3ffc8686687eee411f5f7b4e377f':
  Register ActivityManagerService.PackageMonitor for all users.
 2014-09-24 16:20:17 +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
acf163b682 am 70fccb3c: am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '70fccb3c3dad8431f8cc3c0069c0e2ea47cb0827':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 16:22:40 +00:00
John Reck
0110911b38 am 316ad883: am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '316ad883b5d5a37c4d39c328e9acb2995403337b':
  Aggressively trim memory for system_process
 2014-09-23 16:20:58 +00:00
George Mount
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 15:53:42 +00:00
John Reck
5315ce4bf1 am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
  Aggressively trim memory for system_process
 2014-09-23 15:49:41 +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
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