Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
219,806 Commits 3 Branches 0 Tags
fc5ac06906013eefba45a3f91f1cf733a3527697
Commit Graph

58127 Commits

Author SHA1 Message Date
Todd Kennedy
fc5ac06906 Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 am: e9c7512147 
am: eede174f7b

* commit 'eede174f7b7ee6fa8f1ad7de237c1d647a5db05f':
  Set host when restoring a fragment
 2015-10-20 01:16:19 +00:00
Svetoslav Ganov
af9d635f8e Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad am: 2a95159d2c 
am: 7fdc5d95ad

* commit '7fdc5d95ada01a378877d6a7c8be1894eb869e04':
  Don't allow concurrent permission requests.
 2015-10-20 01:14:04 +00:00
Aravind Akella
cf3cd44b3c am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a 
am: fd81002e71

* commit 'fd81002e719737696c1c5913f2ba77f2e28883f3':
  Fix a possible race condition in SensorManager initialization.
 2015-10-20 01:12:52 +00:00
Todd Kennedy
eede174f7b Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 
am: e9c7512147

* commit 'e9c751214715f3d136ae07fe9f553c488d01f352':
  Set host when restoring a fragment
 2015-10-19 23:52:37 +00:00
Svetoslav Ganov
7fdc5d95ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad 
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.
 2015-10-19 23:50:28 +00:00
Todd Kennedy
d419d86952 Merge "Set host when restoring a fragment" into mnc-dr-dev 
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
 2015-10-19 23:22:57 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev 
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
 2015-10-19 23:13:46 +00:00
Todd Kennedy
986d4b482d Merge "Set host when restoring a fragment" into mnc-dr-dev 2015-10-19 22:52:27 +00:00
Svetoslav Ganov
e199016a82 Merge "Don't allow concurrent permission requests." into mnc-dr-dev 2015-10-19 22:41:35 +00:00
George Mount
d532a4a076 Merge "Set the bounds on the drawable for ChangeBounds reparenting." 2015-10-19 22:20:52 +00:00
John Reck
ba64d6af95 Merge "Fix trace end in inflate" 2015-10-19 22:00:54 +00:00
Aravind Akella
fd81002e71 am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a 
* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:41:36 +00:00
Aravind Akella
005d36d1b0 Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 
am: a817c90a7a

* commit 'a817c90a7ab296473345b0e106acc9be4e5b678c':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:32:25 +00:00
Aravind Akella
a817c90a7a Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 2015-10-19 21:15:28 +00:00
George Mount
f2a3703696 Set the bounds on the drawable for ChangeBounds reparenting. 
Bug 24993183

The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.

Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
 2015-10-19 13:50:16 -07:00
Todd Kennedy
ac0e6ca0d2 Set host when restoring a fragment 
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.

Bug: 22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
 2015-10-19 12:55:19 -07:00
John Reck
465e1a3e12 Fix trace end in inflate 
Change-Id: I62809d70410a045231c8210ecd94a0bfc5e2d2fb
 2015-10-19 12:46:09 -07:00
Aravind Akella
a05df455e8 Fix a possible race condition in SensorManager initialization. 
Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
 2015-10-19 12:18:37 -07:00
Pablo Ceballos
63afb86381 Merge "Remove GLTrace support" 2015-10-19 17:55:59 +00:00
Stuart Scott
32c97eef98 Merge "Suppress testAndroidTestCaseSetupProperly" 2015-10-19 15:31:24 +00:00
Julia Reynolds
aeeb39d2ec Merge "Add Notification topics." 2015-10-19 14:38:40 +00:00
Chris Wren
75313c4ebb Merge "update metrics enums" 2015-10-19 14:17:44 +00:00
George Mount
2d17f8643b Merge "Change wrong doc about using linear interpolator." 2015-10-16 22:27:48 +00:00
Roozbeh Pournader
ca9dbf596d am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit 'ebdf60e7c800b2ccda01887a304ddc0edce0361d':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:20:01 +00:00
Roozbeh Pournader
ebdf60e7c8 am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:12:46 +00:00
Roozbeh Pournader
b3538082d7 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:01:49 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Chris Wren
f885276e6f update metrics enums 
Change-Id: I5c4b20dc514889493e3049b4242876633ebebcde
 2015-10-16 17:41:13 -04: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
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
Svetoslav
ffb32b1f24 Don't allow concurrent permission requests. 
bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
 2015-10-16 13:42:32 -07:00
Julia Reynolds
74303cfe2b Add Notification topics. 
Topics are tags that developers can add to group notifications
by theme. Users will be able to block notifications by topic.

Bug: 22451710
Change-Id: I5b4677da66b21933f479f5e56c18ca563810b43b
 2015-10-16 16:38:45 -04: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
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
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
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
Erik Kline
2b49a7df64 Merge "Incorrect time used in some NTP server responses" 2015-10-16 19:02:00 +00: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
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
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