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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b115e5986b
am bbeae741: am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit 'bbeae741c75fbe7fba2a91ab4b8c7a95f987494d':
Create an Application object for the system process.
2014-09-18 21:00:33 +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
a8c1d0232b
am bd0d84df: am c18f3cff: am 6140df56: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
...
* commit 'bd0d84df3bbda95affdf4cab0e597cc126919883':
Fixed OOM due to visibility transitions.
2014-09-16 21:04:02 +00:00
George Mount
71c0f7330b
am 8c08a7e5: am 36f24d34: am f7dfba19: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
...
* commit '8c08a7e5bd11715b32645d0ff84626a2d9c3273c':
Fixed enter/exit transitions working against shared elements.
2014-09-16 21:03:57 +00:00
George Mount
08ff5c14fe
Merge "Fixed OOM due to visibility transitions." into lmp-dev
2014-09-15 18:12:24 +00:00