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

45397 Commits

Author SHA1 Message Date
Nick Kralevich
23c888acab am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'fa06d03edf7b40f62615c58233dbdf135bac11df':
  Fix App Ops permission mapping structure.
 2013-10-08 16:02:54 -07:00
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
 2013-10-08 16:02:40 -07:00
Dianne Hackborn
e02c3eec84 am 19a6a86a: am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit '19a6a86ae148b3ee15ef7499302e9ed7c1bea682':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 16:02:34 -07:00
Alan Viverette
e94ec3e79a am 57cc6283: am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 
* commit '57cc628355e434d4b313e9b60e1a68a0643fda04':
  Fix HIDE_DESCENDANTS accessibility importance mode
 2013-10-08 16:02:29 -07:00
Daniel Sandler
32bc10303c am 4be3db70: am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev 
* commit '4be3db7018154406ab74e029482a7d82dbcd3a5a':
  Don't wake users up with low battery sounds.
 2013-10-08 16:02:16 -07:00
Nick Kralevich
fa06d03edf am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit '0b8fd029c052784d4adee940eaa904a339db6716':
  Fix App Ops permission mapping structure.
 2013-10-08 14:33:40 -07:00
Nick Kralevich
0b8fd029c0 am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
  Fix App Ops permission mapping structure.
 2013-10-08 14:30:11 -07:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
 2013-10-08 14:12:37 -07:00
Jeff Sharkey
58ff8af53a am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'a6af40cda29837fb68507f431ee5a179db93de28':
  Add secondary external storage support.
 2013-10-08 14:09:49 -07:00
Jeff Sharkey
a6af40cda2 Merge "Add secondary external storage support." into klp-dev 2013-10-08 21:05:36 +00:00
Dianne Hackborn
19a6a86ae1 am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit 'c35ae6e784dcf1a3480fbcc12e09d51bdffce686':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 13:36:53 -07:00
Dianne Hackborn
c35ae6e784 am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit 'c739a765981174dc82bf268c379a5c7bc17167f4':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 13:33:59 -07:00
Dianne Hackborn
c739a76598 Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 2013-10-08 20:29:47 +00:00
Alan Viverette
57cc628355 am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 
* commit '76597552805f810ff7de15f6fad72a0a89ff5724':
  Fix HIDE_DESCENDANTS accessibility importance mode
 2013-10-08 13:19:31 -07:00
Alan Viverette
7659755280 am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 
* commit '3a407fad3554fe9567bb8769b060233b3efc0633':
  Fix HIDE_DESCENDANTS accessibility importance mode
 2013-10-08 13:16:38 -07:00
Alan Viverette
3a407fad35 Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 2013-10-08 20:14:21 +00:00
Daniel Sandler
4be3db7018 am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev 
* commit 'f3a56199a526bb21f4196e35a355d8476e4604ce':
  Don't wake users up with low battery sounds.
 2013-10-08 13:07:53 -07:00
Daniel Sandler
f3a56199a5 am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev 
* commit '40bacdf4843ac227b8a19cea47f4424138c8490f':
  Don't wake users up with low battery sounds.
 2013-10-08 13:05:14 -07:00
Jeff Sharkey
44cbdec292 Add secondary external storage support. 
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
 2013-10-08 12:57:11 -07:00
You Kim
bc74de6722 Wrong argument: handleUnstableProviderDiedLocked 
mProvider is HashMap<ProviderKey, ProviderClientRecord>. String
is not correct object for KEY. Complete removal using iterator.

Bug: 11086495

Change-Id: I51e4576544ef02ede6f96938689dd4e43ec6eb4f
 2013-10-08 12:22:30 -07:00
Daniel Sandler
dea6462aab Don't wake users up with low battery sounds. 
Battery sounds will always play when the screen is on, and
then for Settings.Global.LOW_BATTERY_SOUND_TIMEOUT
milliseconds after the screen goes off. After that, low
battery alerts will be pushed out the airlock until the
screen comes back on again.

If battery sounds are suppressed via this mechanism you'll
see a log line like:

	V/PowerUI ( 3161): screen off too long (5779ms, limit
	5000ms): not waking up the user with low battery sound

The default value of LOW_BATTERY_SOUND_TIMEOUT is a settings
provider resource: R.integer.def_low_battery_sound_timeout.

Bug: 10487557
Change-Id: Iddd42038aa630631dc8f1833f20fcc5a0c646681
 2013-10-08 17:37:06 +00:00
Adam Powell
411289ab0d am dde19a85: am 68f60fc1: am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev 
* commit 'dde19a85b5f9dc27c404775702476c90a3012ffc':
  Fix typo in drawable xml
 2013-10-08 10:24:54 -07:00
Torne (Richard Coles)
d724ff6fd7 am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 
* commit '0544b87249ff2f58806c2464f87afcb3c32c62e8':
  Hide Experimental WebView from dev settings DO NOT MERGE
 2013-10-08 10:22:01 -07:00
Adam Powell
dde19a85b5 am 68f60fc1: am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev 
* commit '68f60fc1590e8f1d7d84c5a61aac2e424293ba4a':
  Fix typo in drawable xml
 2013-10-08 10:21:58 -07:00
Torne (Richard Coles)
0544b87249 am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 
* commit 'facf26c0531c981fb61f07f23ffe9aa0221564ea':
  Hide Experimental WebView from dev settings DO NOT MERGE
 2013-10-08 10:19:36 -07:00
Adam Powell
68f60fc159 am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev 
* commit '2d3f3b1c8095f7f92d084a90ff4311ef48ff2aff':
  Fix typo in drawable xml
 2013-10-08 10:19:34 -07:00
Torne (Richard Coles)
facf26c053 Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 2013-10-08 17:17:07 +00:00
Adam Powell
2d3f3b1c80 Merge "Fix typo in drawable xml" into klp-dev 2013-10-08 17:15:39 +00:00
Adam Powell
0b6afb3356 Fix typo in drawable xml 
Bug 11130411

Change-Id: I76e1f5f684b17a4fa9e3e7064f7ab66029171c70
 2013-10-08 10:10:40 -07:00
Jonathan Dixon
be706eb1c1 Hide Experimental WebView from dev settings DO NOT MERGE 
Bug 10427705

The persist.webview system property is no longer needed, so removed too.

Change-Id: I8f02736469464b52636f3d59ec8537d11766d39f
 2013-10-08 17:59:13 +01:00
Svetoslav Ganov
91adc9ff6f am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit '98b07f4e1ea7c5a861c2c66278816ab6c8fd02d1':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:44:18 -07:00
Svetoslav Ganov
98b07f4e1e am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit 'b02b14b21e46c531ae726094413f036ae36c56f9':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:39:08 -07:00
Svetoslav Ganov
b02b14b21e am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit 'ef4a6f866241852f60a25b7c0bca41750dee816e':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:35:48 -07:00
Svetoslav Ganov
ef4a6f8662 Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 2013-10-08 16:34:27 +00:00
Leon Scroggins III
6034ee95a0 am 25c4e987: am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev 
* commit '25c4e98711d29a69db96526e3c72604f7dbb1005':
  Do not attempt to decode  NULL SkData.
 2013-10-08 06:41:06 -07:00
Leon Scroggins III
25c4e98711 am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev 
* commit '97b707d5eb34d5e76e2b820c158b14fe47631be0':
  Do not attempt to decode  NULL SkData.
 2013-10-08 06:38:45 -07:00
Leon Scroggins III
97b707d5eb am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev 
* commit '80a058b3033200835f86ee0e61367a87a470cde8':
  Do not attempt to decode  NULL SkData.
 2013-10-08 06:35:04 -07:00
Leon Scroggins III
80a058b303 Merge "Do not attempt to decode NULL SkData." into klp-dev 2013-10-08 13:33:05 +00:00
Alan Viverette
24cafbc56c Fix HIDE_DESCENDANTS accessibility importance mode 
Ensures accessibility framework is notified when subtree visibility
changes as a result of hiding descendants. Fixes collision between
HAS_TRANSIENT_STATE flag and IMPORTANT_FOR_ACCESSIBILITY mask.

BUG: 11087525
Change-Id: I92dba27350970a09e76b5a878c7604ea06cae197
 2013-10-07 18:28:45 -07:00
Alan Viverette
550b89e6de am 80fad292: am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '80fad292318ac2e1e76435bb8334017a702a62d7':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:17:37 -07:00
Alan Viverette
80fad29231 am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '6d774ac6049de8bf347a735eb67c491bb2623aa1':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:15:05 -07:00
Alan Viverette
6d774ac604 am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit 'bdae814816085ac9d4a48580e86a7ef4a0bcb5d6':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:11:45 -07:00
Alan Viverette
bdae814816 Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 2013-10-08 01:09:00 +00:00
Alan Viverette
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
1bdbdfbe6a am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '6930d3805e1f0e770c636b8419a105bc19919048':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:51:30 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Svetoslav Ganov
db63677c7c Do not do a layout and write while a cancellation is in progress. 
While printing the app gets callbacks to do a layout and a write. Since
these operations can take a very long time they are implemented in a async
fashion. For example, if there is a layout request while we are still doing
a layout, we ask the application to cancel the previous layout. The problem
was that we were not waiting for the cancellation result before calling
the subsequent layout. Hence, the app ends up having to do two layouts at
the same time which breaks the printing contract. Same for write.

bug:11118426

Change-Id: If7b191c44387d88d5cec195d1785a47f986965ba
 2013-10-07 17:13:01 -07:00
Amith Yamasani
632b7dc884 am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '6db7f39ba573fd087c79da9585801c3f277ac8fc':
  Don't backup/restore ringer mode
 2013-10-07 17:09:04 -07:00
Amith Yamasani
6db7f39ba5 am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '1eae610981ea1d6f7816d333fb98519f2459a254':
  Don't backup/restore ringer mode
 2013-10-07 17:03:00 -07:00