Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,481 Commits 3 Branches 0 Tags
b95cef8ac0435bd18a671362290633f68749865b
Commit Graph

43934 Commits

Author SHA1 Message Date
Russell Brenner
b95cef8ac0 am c9c663d3: am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c9c663d31884f85bbe14a1505051836288b517fb':
  Print services setting changes not handled for managed profiles.
 2014-08-27 09:48:19 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +00:00
Russell Brenner
ac7334d4fd am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c04b259aa962616089994c8cf225ff396feb1c83':
  Print services setting changes not handled for managed profiles.
 2014-08-27 06:32:14 +00:00
Dianne Hackborn
940434def1 am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit 'eb7a0e4e9bcb6a18655c4f349c90216011406d75':
  Fix issue #17146552: system anr
 2014-08-27 06:20:11 +00:00
Svetoslav
948397a453 Merge "Print services setting changes not handled for managed profiles." into lmp-dev 2014-08-27 06:13:23 +00:00
Dianne Hackborn
5232271a41 Fix issue #17146552: system anr 
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
 2014-08-26 22:55:47 -07:00
Jim Miller
d262f6941f am b4a5c851: am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b4a5c8511288c1a4e234120bbb3b32d0980c47e3':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 05:00:45 +00:00
Adam Powell
c55fd9e225 am 3f9989e0: am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit '3f9989e0e7fa5ce8a425bb95d1957126e2630459':
  Adjust toolbar/action bar title handling
 2014-08-27 05:00:30 +00:00
Dianne Hackborn
3cc8dbb87e am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'bad701ee645948d92982bad90e4d4cfc868e6816':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 04:53:23 +00:00
Jim Miller
bdc2da026f am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b0400d12f8f2dd4ad8088fef9c13dcf37bcb9837':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 04:46:25 +00:00
Adam Powell
a80c4a2296 am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit 'f692592004f011759d9a79824c156b51ab10da13':
  Adjust toolbar/action bar title handling
 2014-08-27 04:46:11 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:33:58 +00:00
Yorke Lee
2822d16b02 am 14407ed0: am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '14407ed0cc8d23c4bbf6609611d522c0986894c1':
  API changes for ContactsContract
 2014-08-27 04:33:54 +00:00
Dianne Hackborn
80e29b66c5 Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 2014-08-27 04:31:26 +00:00
Dianne Hackborn
852975d537 Fix issue #17179314: Make recents limits consistent 
The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.

Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.

With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.

Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
 2014-08-26 21:24:42 -07:00
Christopher Tate
584cce1ce9 am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '663c889c750023e6c7109a57f33034a96432fd35':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:20:12 +00:00
Yorke Lee
84496c7706 am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit 'cca607410716197803663676526cf6368c58a7de':
  API changes for ContactsContract
 2014-08-27 04:20:06 +00:00
Jim Miller
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Adam Powell
4902a89103 Merge "Adjust toolbar/action bar title handling" into lmp-dev 2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e Adjust toolbar/action bar title handling 
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.

Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.

Bug 17138048

Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
 2014-08-26 18:28:17 -07:00
Svetoslav
86b1df2343 Print services setting changes not handled for managed profiles. 
We keep per user settings for enabled print services which are
observed to update the print manager service state. We were listening
to all user changes but the handling code was not updating the state
of the user whose settings changed, rather the current user.

Added hidden APIs in content observer to know which user changed
and now the print manager serivce handles content changes for the
correct user.

bug:16977006

Change-Id: I71ec88c8f3f38cb405844c13ab83695c2029eb79
 2014-08-26 18:19:13 -07:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00
Yorke Lee
5edb638eed Merge "API changes for ContactsContract" into lmp-dev 2014-08-27 00:51:07 +00:00
Yorke Lee
b31c8abdc4 API changes for ContactsContract 
* Hide NAME_VERIFIED
* Add PinnedPositions.pin

Bug: 17253963
Change-Id: I887fb291fa4de8db6859655956a80898d1ee618c
 2014-08-26 17:13:02 -07:00
Christopher Tate
8ab0865156 Briefly log wallpaper restore outcomes 
Bug 17112780

Change-Id: I3e9a23d28c9df4f708eb24b4688322c21a8c8382
 2014-08-26 17:08:04 -07:00
Jeff Hao
d72790e900 am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit '92c7379cf75b6ddce98f03c223d14267227436d2':
  Add sample profiling option to am.
 2014-08-26 23:39:57 +00:00
Jeff Hao
2583ced835 am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit 'c4ef03d0144ca92957724d142c9511bcc5603094':
  Add sample profiling option to am.
 2014-08-26 23:25:44 +00:00
Alan Viverette
be869608a4 am 9ad1f076: am a83f3c86: am 2b013731: Merge "Use bounds in screen for better A11y backwards compatibility" into lmp-dev 
* commit '9ad1f0766becd6414c8e472373e4a62b6320a226':
  Use bounds in screen for better A11y backwards compatibility
 2014-08-26 23:21:18 +00:00
Alan Viverette
5fdd5bc3e3 am c60c9895: am fd6bc26a: am 413e2c21: Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 
* commit 'c60c989509fda863aff17361fe26008070455296':
  Make shadow alpha properties public, add lighting values for TV
 2014-08-26 23:21:13 +00:00
Alan Viverette
c628f6a965 am 0324d77a: am 4c06e89b: am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '0324d77a8f1e5412e8f59db81863927359aa493f':
  Update date and time picker styling
 2014-08-26 23:21:08 +00:00
Alan Viverette
e1b0e79362 am a83f3c86: am 2b013731: Merge "Use bounds in screen for better A11y backwards compatibility" into lmp-dev 
* commit 'a83f3c861444425092c60a3a51a9d25d05ab8ab8':
  Use bounds in screen for better A11y backwards compatibility
 2014-08-26 23:10:23 +00:00
Alan Viverette
b6b6bf7d06 am fd6bc26a: am 413e2c21: Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 
* commit 'fd6bc26a382599e3796e2fe15a30207bbff7e3de':
  Make shadow alpha properties public, add lighting values for TV
 2014-08-26 23:10:09 +00:00
Alan Viverette
7b5bf2f10b am 4c06e89b: am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '4c06e89b3c661ebb3451ff64c293b823e8c655b7':
  Update date and time picker styling
 2014-08-26 23:10:02 +00:00
Jeff Hao
0dedb722e6 Merge "Add sample profiling option to am." into lmp-dev 2014-08-26 22:59:36 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am. 
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
 2014-08-26 15:54:25 -07:00
Alan Viverette
22d8a776cd Merge "Use bounds in screen for better A11y backwards compatibility" into lmp-dev 2014-08-26 22:52:47 +00:00
Alan Viverette
f3542fd63f Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 2014-08-26 22:52:32 +00:00
Alan Viverette
03740d74ca Merge "Update date and time picker styling" into lmp-dev 2014-08-26 22:51:50 +00:00
Jim Miller
23cfead9e6 am f5b9dacd: am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'f5b9dacd48d29877a1c92414fd4d2973e3db6837':
  Hide fingerprint API until new API is ready
 2014-08-26 22:34:34 +00:00
Jim Miller
7364f8d54e am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'ed18d240c9e565806beed2fc8701d3eb2c5cf8cd':
  Hide fingerprint API until new API is ready
 2014-08-26 22:23:12 +00:00
Jeff Sharkey
c56405822c am 70b6d65b: am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '70b6d65beac2e33e96e0f1487316f4d7119168ac':
  Report FileBridge failures as wtf().
 2014-08-26 22:16:41 +00:00
Christoph Studer
37b84639a2 am d4b0a4b1: am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'd4b0a4b1641031fc3d2e74beecee4eccea46d1ae':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:16:27 +00:00
Christoph Studer
469e5c127a am 46a63c20: am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '46a63c20759747e0aef2b76d3a378013f6084d04':
  Notification: Optimize L icon processing
 2014-08-26 22:16:22 +00:00
Jim Miller
e7b6b1aae7 Merge "Hide fingerprint API until new API is ready" into lmp-dev 2014-08-26 22:02:52 +00:00
Jeff Sharkey
971c5910e7 am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '232aac5cc0313a94ce3c96bd0f3a13e0b70c9a36':
  Report FileBridge failures as wtf().
 2014-08-26 22:01:00 +00:00
vandwalle
fb9cf903fb am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:00:54 +00:00
Christoph Studer
b3196d3327 am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'deefd53448758914da3c943e0cff751fc5f783fc':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:00:25 +00:00
Christoph Studer
ad486ef172 am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '483086029fe7556903e0b4131c6fedf9f8690fa5':
  Notification: Optimize L icon processing
 2014-08-26 22:00:14 +00:00
Alan Viverette
ed6f14a20c Make shadow alpha properties public, add lighting values for TV 
BUG: 17189722
BUG: 17221975
Change-Id: I4ed477b658fec96ce69fa278f67345dab6bacaa3
 2014-08-26 14:53:28 -07:00