Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,266 Commits 3 Branches 0 Tags
445fff144d37d3b4af978decafbb4455683fdf02
Commit Graph

4897 Commits

Author SHA1 Message Date
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
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
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
Chris Wren
af098c5657 Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 2014-09-30 18:50:05 +00: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
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
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
3d1ec96754 am 32c4f093: am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '32c4f093d8088fd283147217c06ccf3d5843e4db':
  Target only shared elements with shared element Transition
 2014-09-19 23:29:53 +00:00
George Mount
02c377e139 am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '6ba1531e66ca6c483ef762339513e1086cbdf76d':
  Target only shared elements with shared element Transition
 2014-09-19 21:47:50 +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
15b6dde72f am 2bfae686: am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit '2bfae68607041ec8ec02e7c77471f22202b9ce8d':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:55:03 +00:00
Amith Yamasani
d587057246 am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit '4ad6b3ef184424e36915bc046e04706f2dded0e2':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:40:50 +00:00
George Mount
f028e103f1 am d5da500e: am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'd5da500e170fe3e2b430f27ac250b5b61dc90bcc':
  Fix exception when fragment container has no View.
 2014-09-19 16:40:39 +00:00
George Mount
e06fa37930 am ad022964: am 4785cb7f: am 46df1eee: am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit 'ad0229649dd7f9487dd0f4ecc4f777b738baee25':
  Fix NPE when shared element listener is null.
 2014-09-19 16:40:35 +00:00
George Mount
1a780826c2 am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'fbb670d9ddd16c174369cdd4575860dee6ffe8c4':
  Fix exception when fragment container has no View.
 2014-09-19 16:30:33 +00:00
George Mount
74b01d84af am 4785cb7f: am 46df1eee: am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '4785cb7f541951cf3e31a84acf0767c7393fbe92':
  Fix NPE when shared element listener is null.
 2014-09-19 16:30:28 +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
580c8675be am e83001aa: am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit 'e83001aaea1a8c63dc86d1c63d243a97441b6a3e':
  Remove suggested key names as its confusing.
 2014-09-19 13:40:47 +00:00
Kenny Guy
4b34d39ebd am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '86d6e75144097fe6be741c2ac0756a82c98d3dc7':
  Remove suggested key names as its confusing.
 2014-09-19 13:26:56 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Craig Mautner
c181a05774 am 0adbb788: am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '0adbb788c4500c9241ab195e674f1cbcb3f1d1f2':
  Remove activity icon bitmaps from system process.
 2014-09-19 08:31:44 +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
Craig Mautner
7d06c3758d am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '1b314af5a1a4f0d7f4be38b52caa3a2c28a1da4e':
  Remove activity icon bitmaps from system process.
 2014-09-18 22:25:39 +00:00