Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,678 Commits 3 Branches 0 Tags
c5e036a67ebe6083bb3bf567d65890d285de434e
Commit Graph

57560 Commits

Author SHA1 Message Date
Glenn Kasten
c5e036a67e Merge "Fix typo" into nyc-dev 
am: 5cb05f8

* commit '5cb05f810b618112443271fdc8f1cf731593657e':
  Fix typo

Change-Id: I1bc1cd930d99e82d0b5563fd8b9b0ce33184ead0
 2016-04-05 15:08:27 +00:00
Kirill Grouchnikov
94ecef02b4 Merge "Add a hidden test-only API to get Toolbar\'s navigation view." into nyc-dev 
am: bbcf432

* commit 'bbcf4327d216ff9aa9dcce57c485736d21ffed12':
  Add a hidden test-only API to get Toolbar's navigation view.

Change-Id: Id24760bed597ad0b154e0ec1120d065a4627c7ea
 2016-04-05 15:02:43 +00:00
Glenn Kasten
5cb05f810b Merge "Fix typo" into nyc-dev 2016-04-05 15:00:22 +00:00
Rubin Xu
586da02e83 Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 
am: 63d1ee4

* commit '63d1ee45eee7e01bd098c7a9694daaea300c1133':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: Iab160ad25bafd8850ea75fa8575b12466bf9e16b
 2016-04-05 14:56:44 +00:00
Kirill Grouchnikov
bbcf4327d2 Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev 2016-04-05 14:54:48 +00:00
Rubin Xu
63d1ee45ee Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 2016-04-05 14:52:02 +00:00
Alan Viverette
1323b45ff5 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 
am: 16aaa3e

* commit '16aaa3e5355a8a7213bb4cce8383108b9430e3e2':
  Fix bad workaround docs in Resources.getDrawable()

Change-Id: Id40f9e082b21be5d550661a39c0bf826b03159aa
 2016-04-05 14:20:10 +00:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Jason Monk
d2ebee5e73 Revert "Add Preference#onDetachedFromActivity" 
am: b65b710

* commit 'b65b7105cd5d20bf8a9f9c1b10afd6df968bc442':
  Revert "Add Preference#onDetachedFromActivity"

Change-Id: I78a6d99746507b6cde29f25bf161693c5ced4128
 2016-04-05 14:13:32 +00:00
Robin Lee
892af97b0b Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 
am: 691b1a6

* commit '691b1a6005ed373ad75361aa5a1bd120f138f15c':
  Switch to work challenge if MP calls resetPassword

Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
 2016-04-05 14:13:30 +00:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity" 
This reverts commit e18dc50c63.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480)
 2016-04-05 14:06:47 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Keisuke Kuroyanagi
ca3fdc2bdc Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 
am: a46be16

* commit 'a46be16612573ce083404e8731a96ec30eba3c48':
  Fix: Selection handle behavior in scrolled TextView.

Change-Id: I36d2bb4d219242c9fe6cc159a0cd3f55489687dd
 2016-04-05 09:30:51 +00:00
Keisuke Kuroyanagi
a46be16612 Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 2016-04-05 09:24:08 +00:00
Keisuke Kuroyanagi
7b6d818688 Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 
am: a1a56ed

* commit 'a1a56ed09cb3977c580098113a221c7764d31a58':
  Stop automatically creating action mode in FS extracted mode.

Change-Id: Ia74579cbd4115e3be10ded33cecb0fb16ffe6e90
 2016-04-05 07:56:30 +00:00
Keisuke Kuroyanagi
a1a56ed09c Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 2016-04-05 07:50:47 +00:00
Keisuke Kuroyanagi
b1b8865017 Fix: Selection handle behavior in scrolled TextView. 
When dragging a selection handle, it moves to strange position in
scrolled TextView because scroll position isn't took into account.
This issue was introduced by rebase mistaking in
I2a7e87ad08416f4bd01a5f6.

Bug: 28008281
Change-Id: I6217483fcc0b9a7e661f02a1f276114ddd5031a4
 2016-04-05 16:26:16 +09:00
Pavel Zhamaitsiak
faa0492d6b Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 
am: f8565cd

* commit 'f8565cd3f30c60d8343dae3ca8c8bca18c5b451a':
  ConnectivityMetricsLogger: Switch to "pull" model

Change-Id: Ic01fa847282f4d8b37c85c1b877a85df73401200
 2016-04-05 04:34:50 +00:00
Pavel Zhamaitsiak
f8565cd3f3 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 2016-04-05 04:29:12 +00:00
Adam Lesinski
ea0186c2c1 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 
am: a149c42

* commit 'a149c42071197a7759a652accb399bc58ed62bcd':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I034e9ad42bf8e94ca97fd536ba1498fe19f01118
 2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Ashutosh Joshi
c478365740 Merge "App upload to Context hub." into nyc-dev 
am: b4cc448

* commit 'b4cc448946b2edb5802f60a3b1f97efbc8dd7ea0':
  App upload to Context hub.

Change-Id: I273a0503e847cd3fc3fadf85f65d5e5518bd1271
 2016-04-05 01:37:49 +00:00
Ashutosh Joshi
b4cc448946 Merge "App upload to Context hub." into nyc-dev 2016-04-05 01:32:59 +00:00
Pavel Zhamaitsiak
ce13079ab3 resolve merge conflicts of 20ebbb3 to nyc-dev 
Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df
 2016-04-04 17:42:05 -07:00
Yohei Yukawa
acbcf0c687 Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev 
am: 807c3a8

* commit '807c3a828b97e6d619f2dfdfde2f97efc873f6fe':
  Unhide View#dispatch{Start,Finish}TemporaryDetach()

Change-Id: I1e34c5dd1ce5d942def740224df56db35e0c7d95
 2016-04-05 00:13:24 +00:00
Pavel Zhamaitsiak
20ebbb3349 Merge "ConnectivityMetricsLogger: Switch to "pull" model" into mm-wireless-dev 2016-04-05 00:13:18 +00:00
Yohei Yukawa
807c3a828b Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev 2016-04-05 00:05:09 +00:00
Ashutosh Joshi
cafdee9a72 App upload to Context hub. 
Fix constants
Use helper functions to address OS

Change-Id: I61bd1f3eff2716ead2771eda335998f2e9b73afc
 2016-04-04 16:50:27 -07:00
Adam Powell
379dbfe274 Merge "Tweaks for ScaleGestureDetector" into nyc-dev 
am: 13af984

* commit '13af9845d4d6598dd64c4c8c99af93f92e7b56af':
  Tweaks for ScaleGestureDetector

Change-Id: I1bc8c19f1f64b3deda28538dfc81a2ef691ce656
 2016-04-04 23:15:42 +00:00
Adam Powell
13af9845d4 Merge "Tweaks for ScaleGestureDetector" into nyc-dev 2016-04-04 23:06:00 +00:00
Adam Lesinski
3ad1b4899f Fix issue with overridden configuration in onConfigurationChanged 
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.

Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
 2016-04-04 15:24:48 -07:00
Chris Craik
517dad11db Merge "Fix how outlines are sent to rendernode" into nyc-dev 
am: a7f775d

* commit 'a7f775db93235ab25636ab2350ccf6df2729c030':
  Fix how outlines are sent to rendernode

Change-Id: I5ffd4fbd553c3b81aca4290b8c03a9837ac7f31b
 2016-04-04 22:14:25 +00:00
Chris Craik
a7f775db93 Merge "Fix how outlines are sent to rendernode" into nyc-dev 2016-04-04 22:08:32 +00:00
Jorim Jaggi
b99b23ef92 Do not call forceLayout if not needed 
am: 26952d7

* commit '26952d748eaab23330c660fa0d7f5c0450dc1d06':
  Do not call forceLayout if not needed

Change-Id: I87adfe600252a6bc0c0880b4fff534cf67c027f7
 2016-04-04 22:04:41 +00:00
Jorim Jaggi
26952d748e Do not call forceLayout if not needed 
If the relevant frames for the app don't actually change, there is
no reason to call forceLayout and force a layout pass.

Bug: 27864358
Change-Id: I2add8cc5791023937afc154e6e50bbf7efb35adb
 2016-04-04 21:56:48 +00:00
Adam Powell
c6df18f5fa Tweaks for ScaleGestureDetector 
Remove obsolete history and size tracking from ScaleGestureDetector.

Change-Id: I20c323a8a92e467b62eb412b718c2e9e906e7800
 2016-04-04 14:42:24 -07:00
Ruchi Kandoi
aa2936af2c Merge "PowerManager: Adds isSustainedPerformanceModeSupported()" into nyc-dev 
am: a68fe1e

* commit 'a68fe1e4d3a34667e5948912c53290298388427b':
  PowerManager: Adds isSustainedPerformanceModeSupported()

Change-Id: Ief02f71f1230fda43386628d1d263800e5bab6d6
 2016-04-04 20:48:16 +00:00
Ruchi Kandoi
a68fe1e4d3 Merge "PowerManager: Adds isSustainedPerformanceModeSupported()" into nyc-dev 2016-04-04 20:42:12 +00:00
Chris Craik
136d1af1cc Fix how outlines are sent to rendernode 
bug:27918183

Fixes an issue where all convex outlines were pushed as empty rects to
RenderNode.

Also adds outline/reveal clip property logging, so such issues are
easier to debug in the future.

Change-Id: Ic4a996ecd09a8ef84cdf8b963bdb4853c7f6d180
 2016-04-04 13:40:39 -07:00
Kirill Grouchnikov
67960a0a55 Add a hidden test-only API to get Toolbar's navigation view. 
Change-Id: I15d4d9ac7ea77ff260bccdfb9d82c85a7bafdfab
 2016-04-04 16:30:02 -04:00
Bo Liu
05d7c72d17 Merge "Expose setDrawGLFunctionDetachedCallback to webview" into nyc-dev 
am: 2f1eb93

* commit '2f1eb93354d540efcb83e784ca28f6e91eca61d1':
  Expose setDrawGLFunctionDetachedCallback to webview

Change-Id: Ib47e6b22f5229565c043c4770d2f6f421772c203
 2016-04-04 20:26:46 +00:00
Gustav Sennton
a9e0ec2ad0 Merge "Move more code from WebViewUpdateService to separate overridable class" into nyc-dev 
am: 7182d98

* commit '7182d98777d44a3b410f743a12a16457caecd257':
  Move more code from WebViewUpdateService to separate overridable class

Change-Id: Ib680c97299788a3c670635df1c4d055003c19eef
 2016-04-04 20:26:44 +00:00
Bo Liu
2f1eb93354 Merge "Expose setDrawGLFunctionDetachedCallback to webview" into nyc-dev 2016-04-04 20:20:10 +00:00
Gustav Sennton
7182d98777 Merge "Move more code from WebViewUpdateService to separate overridable class" into nyc-dev 2016-04-04 20:19:56 +00:00
Eino-Ville Talvala
6feb02b22f Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev 
am: 68a5811

* commit '68a5811711de6cfe0d61473576428b0a07bd6fb0':
  Camera: Allow preview operation of SCENE_MODE_HDR

Change-Id: I96617748e459bff941e84911049ff5461c0d1107
 2016-04-04 19:46:07 +00:00
Eino-Ville Talvala
d7baa586d5 Merge "Camera: Add proper buffer drop errors to LEGACY mode" into nyc-dev 
am: ecfbb0a

* commit 'ecfbb0a1bbd53be90d49834fdd4ffc9f5b93479c':
  Camera: Add proper buffer drop errors to LEGACY mode

Change-Id: Idb46f7f363a26d26231ec550e2785b39009c1542
 2016-04-04 19:46:05 +00:00
Eino-Ville Talvala
68a5811711 Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev 2016-04-04 19:38:53 +00:00
Eino-Ville Talvala
ecfbb0a1bb Merge "Camera: Add proper buffer drop errors to LEGACY mode" into nyc-dev 2016-04-04 19:38:10 +00:00
Alan Viverette
952802e2d1 Fix bad workaround docs in Resources.getDrawable() 
The real solution is to use ContextCompat, but we can't reference support
library from framework. C'est la vie.

Bug: 27727320
Change-Id: Ib9bcd5f2bdce1996f02fd44877df9ba202b26edc
 2016-04-04 15:33:41 -04:00
Glenn Kasten
570f1c8b23 Fix typo 
Change-Id: I973dfaa17adbb7dce4ceda2e6985937823ef039c
 2016-04-04 12:27:32 -07:00