Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,261 Commits 3 Branches 0 Tags
da0c19e48a5a89d11fb9e4b0a45a1f28af43511b
Commit Graph

35848 Commits

Author SHA1 Message Date
Jeff Sharkey
da0c19e48a am 076d36fd: Derive fingerprint at runtime when undefined. 
* commit '076d36fd94c83ac72b9a16e3ddba0e7a331b00e1':
  Derive fingerprint at runtime when undefined.
 2014-04-28 16:37:28 +00:00
Jeff Sharkey
5568772e81 Derive fingerprint at runtime when undefined. 
Some devices leave "ro.build.fingerprint" undefined at build time,
since they need to build it from the components at runtime.

Bug: 13340779
Change-Id: I4d74398817af22079a11c196dc6742b85d2bfb61
 2014-04-28 08:54:16 -07:00
Chris Wren
1a024628cf am 97773efe: Merge "Remove opPkg from the notification key." 
* commit '97773efef70b199fefc954c4a0de368fd5fb17dd':
  Remove opPkg from the notification key.
 2014-04-28 15:08:59 +00:00
Chris Wren
01c70711d5 Merge "Remove opPkg from the notification key." 2014-04-28 15:03:17 +00:00
Chris Wren
e6345b5194 Remove opPkg from the notification key. 
Change-Id: Iadff2dbeb3c9ec69837d3b6e763f24d687ee368b
 2014-04-28 10:53:05 -04:00
Jim Miller
370ff853fa am 96ac3f1e: Fix doc build. 
* commit '96ac3f1e4ba9f1c549811c1f3421e636bb501c15':
  Fix doc build.
 2014-04-28 03:16:53 +00:00
Jim Miller
df2258be5b Fix doc build. 
We probably don't need to deprecate this constant.  It can still be used
by partner devices if they choose to continue to support widgets.

Change-Id: Ie8c33446e0c5c32d96ed0670df1772adedf6a5de
 2014-04-27 20:11:44 -07:00
Alan Viverette
16f4e0b558 am 85ca5eee: Merge "Quantum ripple for ListView selector" 
* commit '85ca5eee32727b6c831302ac684c367483da9e53':
  Quantum ripple for ListView selector
 2014-04-28 01:17:31 +00:00
Alan Viverette
2a56ef70cd Merge "Quantum ripple for ListView selector" 2014-04-28 01:14:47 +00:00
Alan Viverette
d1ca75bffe Quantum ripple for ListView selector 
Also fixes row clipping and ripple alpha channel. Only supports showing
ripple on a single list row -- multiple rows for focus traversal and
drag-to-open are coming soon.

BUG: 13212804
BUG: 14257108
Change-Id: Ided15611dc868a513e8d2a994723cdf57b0d206c
 2014-04-27 18:13:34 -07:00
John Spurlock
98e6d27586 am 5deb7606: Force condition provider unsubscribe when exiting zen mode. 
* commit '5deb7606e376f248cd2b462c9014e0f0ace6e396':
  Force condition provider unsubscribe when exiting zen mode.
 2014-04-27 21:55:07 +00:00
John Spurlock
1c923a386e Force condition provider unsubscribe when exiting zen mode. 
Bug:13743109
Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
 2014-04-27 17:41:51 -04:00
John Spurlock
4210a3091c am c1644c59: Wire up condition providers to zen mode exit triggers. 
* commit 'c1644c590bbc24955ecd367cb4c8e368c24fe2e5':
  Wire up condition providers to zen mode exit triggers.
 2014-04-27 16:04:22 +00:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers. 
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
 2014-04-27 11:36:32 -04:00
Chris Craik
a398539879 am 79d9d187: Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 
* commit '79d9d187ffbcbbbe1bf19e82606a92c0f5222c2b':
  Support Oval GradientDrawable outlines, and ShapeDrawable
 2014-04-26 02:02:29 +00:00
Chris Craik
6689c9700d Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 2014-04-26 01:59:00 +00:00
Jim Miller
953c4e04fa am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard." 
* commit '427b7fb50b5c2c8f38612a74a7c46ff056e22e68':
  Add new DevicePolicyManager disable flags for keyguard.
 2014-04-26 00:35:45 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
Amith Yamasani
be7734dfb6 am c644d0d1: Merge "Handle density request in LauncherActivityInfo" 
* commit 'c644d0d14cf3ec7fede43116c5bcafea2d57b325':
  Handle density request in LauncherActivityInfo
 2014-04-25 23:08:41 +00:00
Amith Yamasani
0150b48c4c Merge "Handle density request in LauncherActivityInfo" 2014-04-25 23:04:27 +00:00
Chris Craik
7979388d4f Support Oval GradientDrawable outlines, and ShapeDrawable 
Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
 2014-04-25 15:59:47 -07:00
Mark Salyzyn
82452f1436 am d8395db5: am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'd8395db5817c52a87cbf17e7eaa494bf9aa50578':
  EventLog: event log translation errors
 2014-04-25 22:58:52 +00:00
Amith Yamasani
30acde7e90 Handle density request in LauncherActivityInfo 
Change-Id: I4e8dc8ef1454b3881bdb80ae118e2d0d306642f3
 2014-04-25 15:56:26 -07:00
Mark Salyzyn
95df2024ed am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'a19b9c413b3e7f3b6038b06c51d01bab1e0bfda9':
  EventLog: event log translation errors
 2014-04-25 22:52:09 +00:00
Craig Mautner
872a6d5baf am ed14822b: am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit 'ed14822b739f46b9a2a5180c44a22b79124c71ef':
  Throw exception from startActivity if not allowed.
 2014-04-25 22:13:35 +00:00
Craig Mautner
e361268e6e am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit 'cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
  Throw exception from startActivity if not allowed.
 2014-04-25 22:10:12 +00:00
Mark Salyzyn
a19b9c413b am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
  EventLog: event log translation errors
 2014-04-25 22:07:07 +00:00
Adam Powell
5873714110 am 5e626cde: Merge "Fix ScrollView nested scrolling with touch down on buttons" 
* commit '5e626cde018f12ad0509d32b5653eb846b9d5f09':
  Fix ScrollView nested scrolling with touch down on buttons
 2014-04-25 21:39:40 +00:00
Adam Powell
07064fa730 Merge "Fix ScrollView nested scrolling with touch down on buttons" 2014-04-25 21:34:32 +00:00
destradaa
1d98bd899e am 3e446afc: Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 
* commit '3e446afc380db206547d9f1f8f9bd60cf48aa100':
  Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906
 2014-04-25 21:25:11 +00:00
destradaa
08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 2014-04-25 21:21:37 +00:00
Adam Powell
e9a16a5a3e Fix ScrollView nested scrolling with touch down on buttons 
Start ScrollView's nested scroll in onIntercept to signal nested
scrolling parents not to intercept along the vertical axis.

Change-Id: Ieb343ff6b8216b113d3876bf93a804e609257f2a
 2014-04-25 14:21:27 -07:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors 
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
 2014-04-25 13:45:03 -07:00
Kenny Guy
58b305bb00 am 0ec41abf: Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 
* commit '0ec41abf20df9c27cd995b8ca22fa709aff4434b':
  Provide access to ActivityInfo.name from LauncherActivityInfo
 2014-04-25 20:33:55 +00:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard. 
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
 2014-04-25 13:27:10 -07:00
Kenny Guy
86a6430e52 Provide access to ActivityInfo.name from LauncherActivityInfo 
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
 2014-04-25 21:21:55 +01:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
 2014-04-25 18:45:06 +00:00
destradaa
cc972725af Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. 
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
 2014-04-25 11:39:16 -07:00
Amith Yamasani
9c28d12f48 am b5b77c47: Merge "Allow profile owners to set user restrictions" 
* commit 'b5b77c47c4dc41b75e73b42378d3c63647ac4fd0':
  Allow profile owners to set user restrictions
 2014-04-25 18:28:25 +00:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
John Spurlock
ff1005a6f5 am 7745fb9e: Merge "Introduce condition provider services." 
* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.
 2014-04-25 18:21:40 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Yuling Liang
35e990ce32 am 7b3e16ef: am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit '7b3e16ef730e694e9d1fbd73bee35f4d69ba5401':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:41:48 +00:00
Yuling Liang
2be1f8c3f4 am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit '69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:38:00 +00:00
Yuling Liang
69a9d92502 am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:35:52 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView" 
This reverts commit a10e19845c.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
 2014-04-25 17:32:08 +00:00
Alexandra Gherghina
ded34b77ee am a30c2028: Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 
* commit 'a30c20287ce2f6dd15bc402b66e5d5721ad65699':
  Temporarily switch off returning only enabled profiles to support dogfooding
 2014-04-25 17:18:22 +00:00
Alexandra Gherghina
d8e6a5f18a Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 2014-04-25 17:12:44 +00:00
Alexandra Gherghina
92d6aea86e Temporarily switch off returning only enabled profiles to support dogfooding 
Bug: 14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
 2014-04-25 18:11:21 +01:00