Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,364 Commits 3 Branches 0 Tags
27dd47f81ae13486ffa79f83df22a61be7019764
Commit Graph

44224 Commits

Author SHA1 Message Date
Yigit Boyar
27dd47f81a am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'a07169280401c84ac914b98028d7e991cee5a85d':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 03:17:19 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00
Ruben Brunk
5426bc2351 am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '6a80927aef62f74a4801180adf68fe8781181060':
  camera2: refactor LEGACY mode error handling.
 2014-09-21 19:25:56 +00:00
Ruben Brunk
2610a1ba5d Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 2014-09-21 19:16:57 +00:00
Ruben Brunk
e663cb7728 camera2: refactor LEGACY mode error handling. 
Bug: 17431462
Bug: 17407537

- Add Surface format/size validation during configure.
- Update exception error codes used in binder calls.
- Report dropped requests, frames, captures, and device
  errors in binder callback properly.
- Fixes CameraDeviceTest errors for incorrect metering
  rectangle weight in template tests.
- Fixes CameraDeviceTest errors for missing
  noiseReductionMode field in template tests.
- Implement flush call.

Change-Id: I0da803bccf2bfb9b4c0cf61208e160a86c577497
 2014-09-21 12:09:23 -07:00
Svetoslav
e5b726efca am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '23e6a2440435d417791e99b95402721b535f73e4':
  Fix memory leak in accessibility cache.
 2014-09-21 18:02:20 +00:00
Svetoslav
650d7d9dd2 Merge "Fix memory leak in accessibility cache." into lmp-dev 2014-09-21 17:53:45 +00:00
Svetoslav
13bd771c99 Fix memory leak in accessibility cache. 
We were not clearing the cache if window state change event
is fired which was the behavior before adding the window
inspection APIs. As a result if no accessibility service
cares about windows we get a leek. Also when the accessibiilty
service cares about windows we were not clearing all windows
nodes from the cache. Now if a windows change or a window
state change event is recived we clear the cache.

bug:17589257

Change-Id: I8c416fbcab623160c6f505128b9fca713fcc6623
 2014-09-19 19:21:55 -07:00
Yigit Boyar
0f46dd0de9 am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
  Find activity from context in menu inflator for click events
 2014-09-20 01:36:12 +00:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Jeff Brown
e8e3125eeb am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.
 2014-09-20 01:27:03 +00:00
Yigit Boyar
30f5dc935b Allow fallback to Toolbar's default Navigation Icon 
Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
 2014-09-19 18:26:07 -07:00
Jeff Brown
6e53b7476e Merge "Decouple turning screen on from waking up in policy." into lmp-dev 2014-09-20 01:09:40 +00:00
Alan Viverette
2300412761 am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons
 2014-09-19 22:27:16 +00:00
Alan Viverette
daf8588275 Merge "Correctly apply max width/height to preference icons" into lmp-dev 2014-09-19 22:19:02 +00:00
Svetoslav
129ffeb37c am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
  Keep existing API behavior that regressed.
 2014-09-19 21:49:31 +00:00
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +00:00
George Mount
6826e9bd3e am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit 'a86f10158a690b30e31216f628942562c3f2e2f2':
  Target only shared elements with shared element Transition
 2014-09-19 21:14:43 +00:00
George Mount
615a2c1605 Merge "Target only shared elements with shared element Transition" into lmp-dev 2014-09-19 21:01:15 +00:00
Svetoslav
b624244325 Keep existing API behavior that regressed. 
If RemoteViews get a null package in the constructor we are
using the context in which they are applied to obtain resources
during inflation. In such a case if we call the getPackage()
method we were getting null, i.e. the package passed in the
contructor, but now we are returning the package if the app
that created the remote views.

bug:17513823
Change-Id: I0c4a8953c8320469a9160dbaae46ce31465b313b
 2014-09-19 13:59:10 -07:00
Adam Powell
45acf7286f am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:43:48 +00:00
Alan Viverette
ecd7c96aa4 Correctly apply max width/height to preference icons 
BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
 2014-09-19 13:36:29 -07:00
Adam Powell
17f48457d2 Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 2014-09-19 20:31:14 +00:00
Jeff Brown
36c4db8bd3 Decouple turning screen on from waking up in policy. 
This allows us to ensure windows are fully drawn before unblocking
screen on while dozing.

Bug: 17516245
Change-Id: Ibe63c212b8db855ce26a34a8169f33764b266ee6
 2014-09-19 13:14:29 -07:00
Michael Wright
299947f502 am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit '66bbf591050bf2969ebebc15e2550d45eeea3ab0':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:05:27 +00:00
George Mount
2deeaa3314 Target only shared elements with shared element Transition 
Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
 2014-09-19 12:55:20 -07:00
Michael Wright
4bc92b064b Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 2014-09-19 19:52:54 +00:00
Adam Powell
c6c744da75 Add colorEdgeEffect to themes, default it to colorPrimary 
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
 2014-09-19 12:50:31 -07:00
Alan Viverette
9af20470b2 am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit '40994e66f278da83e2e4e581c85d5092ee1fb1c0':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:32:40 +00:00
Paul Soulos
f9390f56c6 am b5586e00: Fixes typo in Intent documentation 
* commit 'b5586e00ed5eb4b18b58371a54449f9cc8eedca8':
  Fixes typo in Intent documentation
 2014-09-19 19:32:36 +00:00
Alan Viverette
840855c021 Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 2014-09-19 19:11:47 +00:00
Paul Soulos
628cb74d8a Fixes typo in Intent documentation 
bug: 17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
 2014-09-19 19:10:04 +00:00
Alan Viverette
bb696dcca9 Fix radial time picker inner circle (1-12) selections 
Result of a poorly collapsed set of if block conditionals.

BUG: 17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
 2014-09-19 10:20:45 -07:00
Amith Yamasani
70a2afd10e am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:02:59 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +00:00
George Mount
6ac3f38143 am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
  Fix exception when fragment container has no View.
 2014-09-19 15:50:48 +00:00
George Mount
a667d5dc5e am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
  Fix NPE when shared element listener is null.
 2014-09-19 15:50:44 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Kenny Guy
57224fae58 am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
  Remove suggested key names as its confusing.
 2014-09-19 09:55:37 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Yohei Yukawa
2b6307c894 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 06:21:05 +00:00
Dan Sandler
103daa0c49 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 05:29:34 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash 
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
 2014-09-19 05:02:59 +00:00
Dianne Hackborn
f2cf16436b am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 04:17:41 +00:00
Yigit Boyar
6a0c7b1ba8 am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 04:08:55 +00:00
Dan Sandler
20d01ad8a1 Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03 Fix LayoutInflater copy constructor logic. 
Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
 2014-09-18 22:23:32 -04:00
Dianne Hackborn
ace27915d2 Fix issue #17564607: Apps in the managed profile can send any intent... 
...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
 2014-09-18 19:01:01 -07:00