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

181975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sander Alewijnse
8f6afec2aa Merge "Move the check for launcher managed profile support." 2015-02-09 10:17:57 +00:00
Zhijun He
6de4c88271 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b 
automerge: 0b039b0

* commit '0b039b031557d77e112e88925904e9668f764aa7':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:29:18 +00:00
Zhijun He
0b039b0315 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b 
* commit '9f8e82ed968115d14a564397c6b316af3ba42caf':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:23:05 +00:00
Zhijun He
9f8e82ed96 am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b 
* commit 'f7f131105d479d30b53b2366e29278fd09f36065':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:12:44 +00:00
Zhijun He
f7f131105d Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 
automerge: 07c745b

* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:04:38 +00:00
Zhijun He
07c745b525 Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 2015-02-08 17:38:03 +00:00
Svet Ganov
f33fe1f486 Accessibility: Handle a missed case when clicking focused views. 
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.

bug:19252492

Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
 2015-02-07 10:36:59 -08:00
Wale Ogunwale
9459665439 Limit window display frame to size of containing stack 
Some widgets like the PopupWindow use the display frame from
WindowManager to figure-out where to place content. We want to
limit the size of the display frame to the containing stack in
a multi-window environment so widgets and apps don't place
contents outside the containing stack of the window.

Bug: 19225079
Bug: 19286146
Change-Id: I58e2db47f6696260d7641cf5d588c4f2db6aff5a
 2015-02-06 19:27:34 -08:00
Elliott Hughes
41ba04eed9 Remove obsolete 'numeric_date_template'. 
The only caller was removed in f91f06a5991451e4af3cf99eba791cb3009810d2.

Bug: 18388178
Bug: 18322220
Change-Id: I222363186ad1b9e25c8d8bf0f3928e42cf9bd275
 2015-02-06 18:18:06 -08:00
Joe Fernandez
6bfe8325b9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
automerge: 843b2c7

* commit '843b2c7aa9e38f39732a279d7901f66893b37ab7':
  docs: remove + annotations in version references
 2015-02-07 01:56:15 +00:00
Joe Fernandez
843b2c7aa9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1':
  docs: remove + annotations in version references
 2015-02-07 01:53:04 +00:00
Zhijun He
dd72be5971 camera-metadata: clarify the AE precapture trigger spec 
Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-02-06 17:51:34 -08:00
Joe Fernandez
e3bc656a62 am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'a8b341cdf00e169beb944c0205c98977f835424e':
  docs: remove + annotations in version references
 2015-02-07 01:47:32 +00:00
Jason Sams
46ba27e3fd Implement array types 
Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
 2015-02-06 17:45:15 -08:00
Joe Fernandez
a8b341cdf0 am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit '5ac30e10ab484fdb7ba3c56b8c162a9061601f8e':
  docs: remove + annotations in version references
 2015-02-07 01:22:13 +00:00
Joe Fernandez
5ac30e10ab am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
  docs: remove + annotations in version references
 2015-02-07 01:13:52 +00:00
Joe Fernandez
66c06cf9bb am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'd224fb8a6c86b0c26c5db570cead5f19ff7133bd':
  docs: remove + annotations in version references
 2015-02-07 01:08:46 +00:00
Joe Fernandez
d224fb8a6c am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references
 2015-02-07 01:00:53 +00:00
Joe Fernandez
ba20f98c88 Merge "docs: remove + annotations in version references" into lmp-docs 2015-02-07 00:55:17 +00:00
Bryce Lee
f5a3fee9d6 am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev 
automerge: d1444b6

* commit 'd1444b63a173ce21f8588e09fd17f3cc83528c24':
  Allow single press of physical button to go home without sleeping.
 2015-02-07 00:41:29 +00:00
Bryce Lee
d1444b63a1 am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev 
* commit '1d97aa4d209d7019402a2925c2ca7eb2e36901c7':
  Allow single press of physical button to go home without sleeping.
 2015-02-07 00:39:18 +00:00
Bryce Lee
1d97aa4d20 Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev 2015-02-07 00:32:27 +00:00
Svet Ganov
11f51ffad2 am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 
automerge: f89c6f3

* commit 'f89c6f3c8068bc90557a6ade5b0541da4b2ff622':
  Accessibility: ignore children of a view with node provider.
 2015-02-07 00:16:13 +00:00
Svet Ganov
e7fad2fa90 am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
automerge: 033c2a2

* commit '033c2a21f857948416eeaa36e6a613743b548eff':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-07 00:14:54 +00:00
Svet Ganov
f89c6f3c80 am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 
* commit 'eb642b60e7b1d2a62331303e699df874a50ad527':
  Accessibility: ignore children of a view with node provider.
 2015-02-07 00:11:05 +00:00
Svet Ganov
033c2a21f8 am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '763ce6c0c48416a67a36919d1b7ac67d6b73c430':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-07 00:10:59 +00:00
Svet Ganov
eb642b60e7 am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 
* commit 'ff9b2525db61d4c175d9d61a0847586001cd4a11':
  Accessibility: ignore children of a view with node provider.
 2015-02-06 23:58:52 +00:00
Svet Ganov
763ce6c0c4 am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '41daba0052f4a9146aad4977da9eccf3c72450ce':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-06 23:58:49 +00:00
Bryce Lee
3e2e16b614 am a7404dbd: Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 
automerge: 35dd319

* commit '35dd319e4a652518ab8b89012e5a8cf73a82090d':
  Add voice assist action for global actions.
 2015-02-06 23:10:45 +00:00
Bryce Lee
35dd319e4a am a7404dbd: Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 
* commit 'a7404dbde991d36353440546ff8c92e44d218dfe':
  Add voice assist action for global actions.
 2015-02-06 23:08:54 +00:00
Chris Craik
f7ccbfbd98 Merge "Glop ColorFilter & VertexBuffer support, initial enable" 2015-02-06 23:06:44 +00:00
Bryce Lee
a7404dbde9 Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 2015-02-06 23:05:05 +00:00
Matthew Xie
60675b2273 Separate the protection of mProxyServiceStateCallbacks from that of mService 
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
 2015-02-06 14:13:56 -08:00
Svet Ganov
ff9b2525db am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 
* commit '34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
  Accessibility: ignore children of a view with node provider.
 2015-02-06 21:51:15 +00:00
Svet Ganov
41daba0052 am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-06 21:51:11 +00:00
Svet Ganov
34123f1ce8 Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 2015-02-06 21:49:02 +00:00
Svet Ganov
060bca7444 Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-06 21:46:25 +00:00
Chris Craik
117bdbcfa3 Glop ColorFilter & VertexBuffer support, initial enable 
Enables Glop rendering for supported Rects and VertexBuffers
Also removes unused Query object

Change-Id: Ibe227bc362685a153159f75077664f0947764e06
 2015-02-06 13:42:25 -08:00
Jason Monk
12271e2201 Merge "Remove dead/obsolete carrier label code" 2015-02-06 21:34:01 +00:00
Alan Viverette
d525762a18 Merge "Update colored button styling" 2015-02-06 20:54:45 +00:00
Yin-Chia Yeh
956c52b5a0 Camera2: doc update for HAL3.3 tonemapping change 
Codegen doc change.

Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
 2015-02-06 12:53:31 -08:00
Svet Ganov
55bdb10c16 Accessibility: ignore children of a view with node provider. 
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.

The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.

bug:19297093

Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
 2015-02-06 12:41:21 -08:00
Bryce Lee
a7e8717eb4 am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
automerge: 2820911

* commit '28209111cc74e05fb6caa3d5b1756e57639247a4':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:20:47 +00:00
Bryce Lee
28209111cc am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
* commit '53b9fbd1610b6d3deb837dab34fd309d515f6385':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:18:40 +00:00
Bryce Lee
53b9fbd161 Expose userActivityTimeout through @SystemApi getter/setter. 
This reverts commit 0dad5720902fad041bc8e2221953aab6dd1d2d8f.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
 2015-02-06 12:06:34 -08:00
Jason Monk
c366060792 Remove dead/obsolete carrier label code 
Change-Id: I97563150fb4284f8e6b2b1e2aaf5fcd392b4c6cf
 2015-02-06 15:02:39 -05:00
Bryce Lee
404a1327e9 am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
automerge: a20e430

* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:45:54 +00:00
Bryce Lee
a20e430d0a am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:42:38 +00:00
Bryce Lee
13c7044186 Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090 Revert "Expose userActivityTimeout through @SystemApi getter/setter." 
This reverts commit 40a0ee65f269cffa7d3fb0646bd987a69df5c2d0.

Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
 2015-02-06 19:35:33 +00:00