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

46341 Commits

Author SHA1 Message Date
Robert Greenwalt
5b64ec7439 am 271d79ec: am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '271d79ecf1f0a9ac2c9945735c55a9a33f5fcda6':
  Send callbacks for Net property changes
 2014-10-03 15:59:40 +00:00
Robert Greenwalt
271d79ecf1 am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit 'a9ba8347afb7252b28f51b74b6e1f1ae9befdd75':
  Send callbacks for Net property changes
 2014-10-03 15:55:37 +00:00
Robert Greenwalt
eb35fa56a4 am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '3515ab8092719ea9f61c8c2859bf586aed0955e3':
  Send callbacks for Net property changes
 2014-10-03 15:46:06 +00:00
Robert Greenwalt
3515ab8092 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
 2014-10-03 15:41:04 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
Robert Greenwalt
a848c1cc0a Send callbacks for Net property changes 
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
 2014-10-02 21:05:44 -07:00
Dianne Hackborn
09f25547d9 am 4bcfcc69: am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '4bcfcc69416831b199fb866f56725c88cdcee03c':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:46:25 +00:00
Dianne Hackborn
4bcfcc6941 am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit 'b49a19b9bd2fed00b8fbf3f5a4f9fb7c34e969a3':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:37:54 +00:00
Dianne Hackborn
8aa21f20d8 am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '12dd9943ec01a54453f50a24da2a8e329f2d3790':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 22:59:51 +00:00
Dianne Hackborn
12dd9943ec am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 22:54:53 +00:00
Dianne Hackborn
7a73f2c5aa Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 2014-10-02 22:49:43 +00:00
Jeff Brown
7e742c5748 am 95afeee9: am be9d012f: am 6f2d610f: am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit '95afeee9b12b43c02fbb5469c767ea08d7eeff87':
  Fix race in RecognizerService teardown.
 2014-10-02 22:35:26 +00:00
Jeff Brown
95afeee9b1 am be9d012f: am 6f2d610f: am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'be9d012fd984011049719dcb4af08c63dba64fcc':
  Fix race in RecognizerService teardown.
 2014-10-02 22:29:04 +00:00
Jeff Brown
6f2d610f4d am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'b82bf9df111031e0f3afa4df29fbc22460e6cc8b':
  Fix race in RecognizerService teardown.
 2014-10-02 22:12:54 +00:00
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
Jeff Brown
b82bf9df11 am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
  Fix race in RecognizerService teardown.
 2014-10-02 22:09:08 +00:00
Jeff Brown
ae309489c2 Merge "Fix race in RecognizerService teardown." into lmp-dev 2014-10-02 22:04:09 +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
ac3aed96eb am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:42:18 +00:00
Chris Craik
1ecddc0d3b am 204b3019: am 9977d890: am 438fe593: Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 
* commit '204b30191a77feb6cf56f2aab7de83ea6017b6d2':
  Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates
 2014-10-02 21:35:08 +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
Chris Craik
204b30191a am 9977d890: am 438fe593: Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 
* commit '9977d890e2e063a8e6bcd3d78005e5d0822cf7db':
  Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates
 2014-10-02 20:12:55 +00:00
Chris Craik
438fe5937f Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 2014-10-02 20:02:31 +00:00
Paul West
bc593c56fb am 746bf3b9: am 98bb023a: am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit '746bf3b9b4815dcdb25610402a878b0322618293':
  [DS] DSDS support for widget view
 2014-10-02 19:50:25 +00:00
Dianne Hackborn
67a101aa30 SDK only: Update docs to reflect current implementation. 
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
 2014-10-02 12:44:01 -07:00
Newton Allen
df2b8a1cb9 am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
  Fix some documentation typos.
 2014-10-02 19:43:39 +00:00
Paul West
746bf3b9b4 am 98bb023a: am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit '98bb023a8971d4744fbfc504118b09b04e181e38':
  [DS] DSDS support for widget view
 2014-10-02 19:42:36 +00:00
Jeff Brown
9615697902 Fix race in RecognizerService teardown. 
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
 2014-10-02 12:10:08 -07:00
Newton Allen
94f5155d6c am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
  Fix some documentation typos.
 2014-10-02 16:52:50 +00:00
Newton Allen
c68aad9fd0 am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:47:19 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
 2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
George Mount
cb7172152a am 9ed996ad: am 7aaefa52: am b29b651d: am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit '9ed996ad8766f7c88b0d0b5ffe8bb7ce8eacd24d':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:56:04 +00:00
George Mount
9ed996ad87 am 7aaefa52: am b29b651d: am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit '7aaefa52e034c924a9c536fe378bb8b47efcfdb4':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:50:12 +00:00
George Mount
b29b651dd5 am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:39:41 +00:00
George Mount
a590a95c4d am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:33:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Sreeram Ramachandran
4924e5d87b am 44774ad0: am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '44774ad079e95606186ed186672449de295d6769':
  Send app permissions to netd.
 2014-10-02 13:46:58 +00:00
Dianne Hackborn
7c56fd3c25 am 7cf6cac5: am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '7cf6cac507df68ecb1d6484a5287687e4df61573':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:46:39 +00:00
Erik Pasternak
fcdd687092 am c7cbbe8e: am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'c7cbbe8e82b2dda4889a6663a83586f1e6759282':
  Implement auto-sleep functionality.
 2014-10-02 13:46:34 +00:00
Alan Viverette
7546a39181 am 52bab6e7: am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '52bab6e7220bc85f678f13637d5b9a122d5ca1c9':
  Manage pressed state during drag-to-open
 2014-10-02 13:46:23 +00:00
Neil Fuller
ebf2e8b451 am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
* commit 'c2a0b4482d7144e8382346ea4c22c7b89368fec0':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 13:39:55 +00:00
Sreeram Ramachandran
44774ad079 am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
  Send app permissions to netd.
 2014-10-02 13:39:05 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Alan Viverette
52bab6e722 am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '3c062db99406f083f8c3529bcc56d042b9cb06b0':
  Manage pressed state during drag-to-open
 2014-10-02 13:37:56 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Hui Shu
4299ae9f50 am 0fdb1651: am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '0fdb165193a032ced17c319eebe6a3b2617b2852':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:53:16 +00:00