drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,486 Commits 1 Branch 0 Tags
Commit Graph

56736 Commits

Author SHA1 Message Date
Filip Gruszczynski
825102d77d am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '21187a7a57bf6455fb2ffa8a7cf27fb20308a0b1':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-27 23:30:52 +00:00
Filip Gruszczynski
30a480bcfc Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 2014-08-27 23:22:29 +00:00
Alan Viverette
79dbddefbb am 79bd9953: Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 
* commit '79bd9953b25bb7be002784ecddaa15bcf14b806a':
  Preserve inner drawable bounds and level on mutate
 2014-08-27 22:41:27 +00:00
Filip Gruszczynski
f14d924cd7 Allowing isRound and outsetBottom properties to be passed to ActivityView. 
We remove requirement for having display id == 0 or allow circumventing it
through a flag.

Change-Id: Ia4671614b51894393d47e681cc72718d394230f6
 2014-08-27 15:38:24 -07:00
Alan Viverette
327710e36f Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 2014-08-27 22:29:19 +00:00
Tim Kilbourn
e76d4e26c2 am 6f9d8dd7: Merge "Update leanback shadow parameters." into lmp-dev 
* commit '6f9d8dd760104a47dd9f754fd6a4f96665d3fb00':
  Update leanback shadow parameters.
 2014-08-27 22:26:23 +00:00
Tim Kilbourn
12ed679911 Merge "Update leanback shadow parameters." into lmp-dev 2014-08-27 22:07:37 +00:00
Jim Miller
8730bdf76c am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit 'c5cabe2d00450cb18f856618260e0fa7d780452b':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:44:15 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Jim Miller
c80aaf38ab am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '6104323343861e1d1edc586e19f2fdece3025065':
  Change name of confirm credentials method after API review
 2014-08-27 20:57:32 +00:00
Tim Kilbourn
fe69d6e28c Update leanback shadow parameters. 
Bug: 15859361
Change-Id: I54d184cdf72de98aa0d258774f772f874c6d0490
 2014-08-27 13:54:00 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Alan Viverette
52315cf17f am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '11e73661d71e8616b502f800eca9a7985115e898':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 19:57:54 +00:00
Alan Viverette
12c75ab730 Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 2014-08-27 19:44:37 +00:00
Alan Viverette
d890c13981 Rename Spinner.Form to Spinner.Underlined, make Alert theme public 
BUG: 17286794
BUG: 17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
 2014-08-27 12:28:18 -07:00
Eino-Ville Talvala
e7f72cca40 am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '579442e87e9737f424663d01e163cbc23b1346d1':
  Camera2: Correct error handling
 2014-08-27 18:58:42 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Alan Viverette
d7853e5763 Preserve inner drawable bounds and level on mutate 
Also includes a tiny change to progress bar background alpha, which was
too dark to see.

BUG: 17285057
Change-Id: I8b0cc1c2c9405558b8163d8db9374d7c748317a2
 2014-08-27 17:45:28 +00:00
Julia Reynolds
3dbf82f033 am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'e21130fde2bc10068620d61c5b87ec4ddcc87760':
  Limit the settings profile/device owners can update.
 2014-08-27 16:58:26 +00:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Makoto Onuki
4650b32856 am d37368bf: Address API review comments: 
* commit 'd37368bf06dcaf8956cf69198636562b3043d182':
  Address API review comments:
 2014-08-27 16:42:10 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Raph Levien
1ebf8d619f am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit 'b73047ffc83d9858677e2174c04697502c9d854c':
  New weight-aware font config
 2014-08-27 16:28:09 +00:00
Raph Levien
f1800dcfee am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit '145f5780fabc99b36532d4f57a5c99c7eb727d2c':
  Fix incorrect return value on missing glyph
 2014-08-27 16:28:05 +00:00
Raph Levien
772d576b97 Merge "New weight-aware font config" into lmp-dev 2014-08-27 16:24:37 +00:00
Raph Levien
2a5fab9d47 Merge "Fix incorrect return value on missing glyph" into lmp-dev 2014-08-27 16:24:14 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00
Sander Alewijnse
49a07d7b62 am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit 'eb3f4b1ce11215458c3f231cc8fff0e8e823b6dc':
  Provide lockdown of date/time device owners.
 2014-08-27 14:34:27 +00:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
John Spurlock
48abdd1fb9 am fa4e6f1d: Merge "StatusBar: Add new icon slot for cast status." into lmp-dev 
* commit 'fa4e6f1dd6522dea3c521686f7cc5bfbb850a137':
  StatusBar: Add new icon slot for cast status.
 2014-08-27 14:03:31 +00:00
John Spurlock
98f8a04620 Merge "StatusBar: Add new icon slot for cast status." into lmp-dev 2014-08-27 13:58:14 +00:00
John Spurlock
96fe98d0c0 StatusBar: Add new icon slot for cast status. 
Bug:17275998
Change-Id: I7e80b3d76480fc2fdcb3aa5d445d895829d341d0
 2014-08-27 09:36:02 -04:00
Calin Juravle
fca1ef2c29 am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev 
* commit '729fc678bec8d45b120a5c7fc1657952333f4d79':
  Update the handling of the native bridge property.
 2014-08-27 13:18:32 +00:00
Calin Juravle
6deb439d03 Merge "Update the handling of the native bridge property." into lmp-dev 2014-08-27 13:09:27 +00:00
Russell Brenner
e25ca71d04 am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'd1d4a28a15150018ed60e008c5ff8f40139c578d':
  Print services setting changes not handled for managed profiles.
 2014-08-27 06:20:17 +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
4d363bcc27 am 0d006c60: Fix issue #17146552: system anr 
* commit '0d006c603a8b3a1521dd1bfb0701892c59afd51a':
  Fix issue #17146552: system anr
 2014-08-27 06:09: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
Raph Levien
531dab6d3a Fix incorrect return value on missing glyph 
The GetGlyph function returns a boolean indicating whether the glyph
exists in the font. However, we were testing the pointer, so the test
would always succeed even if the glyph was missing. This interfered with
fallback algorithms for rendering compatibility characters.

Bug: 15816880
Bug: 16856221
Change-Id: I95cd45bb8f5e8ddf74cf23e6e624fbf30172e00a
 2014-08-26 22:19:29 -07:00
Dianne Hackborn
43da8b6546 am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit '61b7055e453799c34d5a442b17d774146c81082d':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 04:39:09 +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
Jim Miller
c047a95116 am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit '771ad8b738161c36eb3ba8a58a8d8652f09fbc54':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 03:46:01 +00:00
Adam Powell
5915967256 am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit '78f0a6e56c6830e7415b4e5035c942a85a85095b':
  Adjust toolbar/action bar title handling
 2014-08-27 03:45:20 +00:00
Jim Miller
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Alan Viverette
94a3aa9d66 am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev 
* commit '39ee1a53af6e8bc73799fa384f6deca95e9e91b9':
  Update list preference layout to more closely match Material spec
 2014-08-27 03:01:19 +00:00
Christopher Tate
115982fddb am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '7bd3661972e644d3b5fa550b9d8ba92de3f57696':
  Briefly log wallpaper restore outcomes
 2014-08-27 03:00:54 +00:00
Yorke Lee
2b6fababda am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '60a3817c487203ecaa4bf26b92d2c7a01ff568a6':
  API changes for ContactsContract
 2014-08-27 03:00:48 +00:00
Jim Miller
bde3d18dd5 Change name of confirm credentials method after API review 
Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
 2014-08-26 19:53:17 -07:00