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

219692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
5fbd9db67a Use null GL for unit tests/microbench 
Change-Id: Ie6234f03d8561b71fc2ebd149ddd7334f275d7c5
 2015-10-19 15:52:28 -07:00
Adrian Roos
5419280fb3 am 2de89ae8: am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '2de89ae843a0a6b492eaa55f96a641df16b718a8':
  Fix wrongly laid out navigation color view
 2015-10-16 21:19:03 +00:00
Wale Ogunwale
645e8a9ae8 Merge "Added support for resizing background color for an app window" 2015-10-16 21:14:06 +00:00
Adrian Roos
2de89ae843 am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '3c439c720d460266358c10d8d2eea9ef9e79beb0':
  Fix wrongly laid out navigation color view
 2015-10-16 21:12:06 +00:00
Adrian Roos
3c439c720d am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
  Fix wrongly laid out navigation color view
 2015-10-16 20:54:40 +00:00
Adrian Roos
85fae34e81 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
 2015-10-16 20:49:59 +00:00
Adrian Roos
70ea857859 Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 2015-10-16 20:43:32 +00:00
Julia Reynolds
52815c3bb4 Merge "resolved conflicts for 429e7dcd to master" 2015-10-16 20:37:46 +00:00
George Mount
97339f196f Merge "Fix documentation for setTransition to include fade." 2015-10-16 20:34:22 +00:00
Julia Reynolds
c72c931eb8 resolved conflicts for 429e7dcd to master 
Change-Id: Id0aca75915a054253d032d333defba1a38b80abe
 2015-10-16 16:25:40 -04:00
Matthew Williams
560bd7c743 am 333d7e0b: (-s ours) am 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '333d7e0bce5bb34de0fe9060290891d7d99b7f38':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 20:19:42 +00:00
Alexander Levitskiy
0d677791d3 Merge "meminfo: Change size suffix to comply with iec, make it parseable with numfmt." 2015-10-16 20:04:49 +00:00
Julia Reynolds
429e7dcd09 am 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '542052dd83e89f7cebc07aa0004a8592efc12364':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:55:25 +00:00
Wale Ogunwale
f3a62fbc58 Added support for resizing background color for an app window 
R.styleable.Window_windowResizingBackground allows an activity to
specify the background drawable that should be used when it is being
resized in multi-window mode. If unset, the system will try to use
R.styleable.Window_windowBackground if set, then
R.styleable.Window_windowBackgroundFallback if set. Otherwise, the
system default resizing background color set by
R.integer.config_windowResizingBackgroundColorARGB.

Also, use decor title color as caption background color when resizing
instead of black.

Bug: 24534744
Change-Id: I83313865b4044b976ebc78d598e14e17e0f37212
 2015-10-16 12:54:31 -07:00
Julia Reynolds
542052dd83 am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:48:47 +00:00
Julia Reynolds
96faf5c8fa am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit 'a762c210d2901bedce5b7972eb139c4d5e59dcd1':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:41:54 +00:00
Matthew Williams
333d7e0bce am 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '6331753e3ba9d6c66c562836f28f3b6e1e178ecd':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 19:39:23 +00:00
Julia Reynolds
a762c210d2 Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev 2015-10-16 19:38:22 +00:00
George Mount
27b3ae6126 Fix documentation for setTransition to include fade. 
Bug 25016696

Also add annotations for FragmentTransaction methods.

Change-Id: If3d1427d83dd7c399609bf8fd9a54467224d3a35
 2015-10-16 12:36:58 -07:00
Adam Lesinski
1f809f7a46 Merge "AAPT2: Separate out the various steps" 2015-10-16 19:16:32 +00:00
Adam Lesinski
1ab598f46c AAPT2: Separate out the various steps 
An early refactor. Some ideas became clearer as
development continued. Now the various phases are much
clearer and more easily reusable.

Also added a ton of tests!

Change-Id: Ic8f0a70c8222370352e63533b329c40457c0903e
 2015-10-16 12:13:08 -07:00
Erik Kline
2b49a7df64 Merge "Incorrect time used in some NTP server responses" 2015-10-16 19:02:00 +00:00
Matthew Williams
6331753e3b am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit 'b01a963a2dd3e4e84eee18f691efdc7856d16ff0':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 19:01:55 +00:00
Matthew Williams
b01a963a2d am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '6875011626e5815473b5d19ddc92d4888bad29f4':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 18:55:33 +00:00
Matthew Williams
6875011626 Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 2015-10-16 18:51:48 +00:00
Chris Craik
cb45c10b81 Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 18:41:04 +00:00
Chris Craik
0fc1065af7 Use FastJNI for trivial MotionEvent native methods 
Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
 2015-10-16 11:39:50 -07:00
Jerry Wong
32d52f344a Incorrect time used in some NTP server responses 
Per RFC 4330, a NTP server response should be discarded when:
    - the stratum is 0 (unspecified), or
    - the leap indicator is 3 (unsync'ed), or
    - the mode is not 4 (server) / 5 (broadcast), or
    - the transmitted time is 0.

Update SntpClient so that such responses would be discarded.

Additionally:
    - make some variables suitably "final"
    - enable logging
    - add alternate requestTime() for testing
    - add some miniscule test coverage

Cherry-picked from Jerry Wong's

    https://partner-android-review.googlesource.com/#/c/460074

Bug: 24719581
Change-Id: Id11a79a6e53ce95500ed4b4d691a29c260666f6c
 2015-10-17 03:36:32 +09:00
Chris Craik
78327393ac Merge "Rename DisplayListData to DisplayList" 2015-10-16 18:36:01 +00:00
Adam Powell
8ebd66ca24 am 4c0011e9: am 824347dd: am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit '4c0011e98212cf2b2a9e0aa2bab32c069de3b253':
  Fix ChooserTarget app scoring
 2015-10-16 18:32:13 +00:00
Adam Powell
4c0011e982 am 824347dd: am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit '824347dd8afc3b8b40e28e4b5d0743b56e341b98':
  Fix ChooserTarget app scoring
 2015-10-16 18:27:05 +00:00
Adam Powell
824347dd8a am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit 'd08f339bcc80bbf368bb7c7b9ddb77d6a9d613fd':
  Fix ChooserTarget app scoring
 2015-10-16 18:21:58 +00:00
Adam Powell
d08f339bcc am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit '749334bffbc92aeaef27c274a1586fa7365cbfdc':
  Fix ChooserTarget app scoring
 2015-10-16 18:13:19 +00:00
Adam Powell
749334bffb Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 2015-10-16 18:08:36 +00:00
Tyler Gunn
beecb61554 am a7304cac: (-s ours) am 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit 'a7304cac85d8c5b0de3cbbe127516675f6cfde5c':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 18:00:22 +00:00
Adam Powell
77a533f5b2 Fix ChooserTarget app scoring 
An initial sorting step before applying modifiers to the ChooserTarget
scores provided by apps was backwards, causing subsequent target
scores to be heavily penalized. Targets are then heavily influenced by
the lowest score in the set relative to the targets from other apps.

Bug 25013559

Change-Id: I39d5d7c601712fc6a19e694d5846d2c8d17a214f
 2015-10-16 10:58:08 -07:00
Tyler Gunn
a7304cac85 am 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit '723900d76a45e8974f357333b72a7df0a7ec4fca':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:52:17 +00:00
Tyler Gunn
723900d76a am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit '95b84f52517548adbd0dff7a22c41c5c4d249c44':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:45:31 +00:00
Chris Craik
afae1463b3 Merge "Revert "Use FastJNI for trivial MotionEvent native methods"" 2015-10-16 17:43:08 +00:00
Chris Craik
526cf82652 Revert "Use FastJNI for trivial MotionEvent native methods" 
This reverts commit a44cd33b98ed011a62a912406eddc051f8b3ded1.

Change-Id: I9a907b0a880368dd61b481b642b50ab57ad08de8
 2015-10-16 17:42:57 +00:00
Tyler Gunn
95b84f5251 am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit 'a5917b71b0e2f98fa6906b795b28cab059cc092b':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:40:19 +00:00
Chris Craik
003cc3dec8 Rename DisplayListData to DisplayList 
Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b
 2015-10-16 10:38:34 -07:00
Tyler Gunn
a5917b71b0 Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 2015-10-16 17:36:40 +00:00
Filip Gruszczynski
9d24cbca0a Merge "Disable stack cropping for docked animating windows only." 2015-10-16 17:32:04 +00:00
Jun Mukai
547c346bb3 Merge "Allow changing mouse cursor for the edges of resizable window." 2015-10-16 17:13:25 +00:00
Jun Mukai
41aab00c3e Allow changing mouse cursor for the edges of resizable window. 
Bug: 23193951
Change-Id: I38662a61ff829e5b441e1c8b9f472eb0d75904e4
 2015-10-16 10:11:32 -07:00
Filip Gruszczynski
955b2fc732 Disable stack cropping for docked animating windows only. 
Non docked windows should be cropped by the stack bounds when they
animate. An example of this is having both a docked activity and a full
screen activity resuming together. The full screen activity should be
cropped.

Bug: 24913915

Change-Id: I35ed71e7625f2fcdb5c51649be9f33d5773c162c
 2015-10-16 10:07:29 -07:00
Abodunrinwa Toki
cd2ed62b1e am 6a82ccbc: (-s ours) am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit '6a82ccbce945fc52bdc35b1cf7661e138feeec2d':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 17:02:02 +00:00
Chris Craik
e4436e325c Merge "Add LinearStdAllocator" 2015-10-16 16:57:23 +00:00
Abodunrinwa Toki
6a82ccbce9 am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit '85978d7c36e94f107bd72166bc18f893b4817cf9':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 16:56:38 +00:00