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

112094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
c91be7119e am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev 
* commit 'e6bbcaf0bc010563c1c65f51ff4610a7bde26609':
  Another asset drop, provider icons, tests.
 2013-09-06 14:00:34 -07:00
Jeff Sharkey
e6bbcaf0bc Merge "Another asset drop, provider icons, tests." into klp-dev 2013-09-06 20:57:39 +00:00
Dianne Hackborn
c268c442a1 am f0ac3a6b: Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 
* commit 'f0ac3a6b04cb23aa5b7e0c1e307e3dea7de6dcc9':
  Fix issue #10650718: Camera DOA on KLP
 2013-09-06 13:45:10 -07:00
Dianne Hackborn
f0ac3a6b04 Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 2013-09-06 20:42:29 +00:00
Victoria Lease
dfd7e1d3e9 am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev 
* commit 'a680b17fb4906570f280d4f06c0d8840a37b709a':
  add NotoSansSymbols to fallback chain
 2013-09-06 13:38:39 -07:00
Mathias Agopian
e669c7aca3 am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev 
* commit '52a5096f7cf6ef2505e182a681b0a9705bbd44bd':
  tweak the electron beam animation a bit
 2013-09-06 13:38:35 -07:00
Dianne Hackborn
5e615ee5ad am a4796d51: Merge "Fix to show correct duration." into klp-dev 
* commit 'a4796d51f6e42300ae8586741becd5ff8612c511':
  Fix to show correct duration.
 2013-09-06 13:38:27 -07:00
Igor Murashkin
76f883e0a8 am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '034052b352e14054d5271ea42985497f6b101b4f':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:38:23 -07:00
Dianne Hackborn
d4a8b9d3c1 Fix issue #10650718: Camera DOA on KLP 
Methods not kept in sync.

Change-Id: I2621255707bbc569ac476b8fb0f7e82f68585b12
 2013-09-06 13:36:57 -07:00
Adam Powell
435f957fee am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit 'b8b017cb6879352aee015ba24e9bfd05cc094e74':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 12:58:24 -07:00
David Christie
8b0c6c22a2 am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp 
* commit 'ba957652bf7aa32cf09de6a5a05a3acfc8912824':
  Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.
 2013-09-06 12:58:14 -07:00
Chris Craik
9b82456072 am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev 
* commit '9b40bdf64420bf1585ccadd36d0a7d38f3c77865':
  Dump the right matrix when logging display lists
 2013-09-06 12:58:06 -07:00
Lajos Molnar
3ec449e081 am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 
* commit '14add7b3e984d07b0208c5620120556f001e25fd':
  MediaPlayer.MTP: fix issue when main thread had no looper
 2013-09-06 12:58:03 -07:00
Victoria Lease
a680b17fb4 Merge "add NotoSansSymbols to fallback chain" into klp-dev 2013-09-06 19:40:00 +00:00
Mathias Agopian
52a5096f7c Merge "tweak the electron beam animation a bit" into klp-dev 2013-09-06 19:16:37 +00:00
Dianne Hackborn
a4796d51f6 Merge "Fix to show correct duration." into klp-dev 2013-09-06 18:48:02 +00:00
Dianne Hackborn
d6d54a4694 Fix to show correct duration. 
Change-Id: I1032d90d5b7bf39006b20f3374104421dcc53305
 2013-09-06 11:46:43 -07:00
Igor Murashkin
034052b352 Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 2013-09-06 18:32:30 +00:00
Adam Powell
b8b017cb68 Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 2013-09-06 18:15:28 +00:00
David Christie
ba957652bf Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp-dev 2013-09-06 18:09:20 +00:00
David Christie
a2b73480c0 Fix QuickSettings to honor location setting for restricted users (b/10553306). 
Generally when a user is location restricted, location will be off.
But just in case location is on and locked in that state, we should
respect that in the UI.

Change-Id: I112139db447ba6dbf4c7c38600406fb5ba6a1fa8
 2013-09-06 10:57:00 -07:00
Jeff Sharkey
6d97d3c1a2 Another asset drop, provider icons, tests. 
Latest asset update, including provider icons which are treated as
special cases for now instead of checking into separate apps.  Add
tests for MIME type matching of roots.  Remove unused XML.

Bug: 10510022
Change-Id: Id567a9e06ba241f60ac011823e550253c6c797fb
 2013-09-06 10:46:54 -07:00
Chris Craik
9b40bdf644 Merge "Dump the right matrix when logging display lists" into klp-dev 2013-09-06 17:43:02 +00:00
Lajos Molnar
14add7b3e9 Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 2013-09-06 17:40:55 +00:00
Vinit Deshapnde
6a3b7db257 am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev 
* commit '771c11b73941994d24e5da5851451ee4088499a6':
  Fix duplicate SSID entries in the WifiSettings UI
 2013-09-06 10:28:56 -07:00
Vinit Deshapnde
771c11b739 Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev 2013-09-06 17:26:39 +00:00
Jeff Sharkey
775bdbdb11 am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev 
* commit 'dc8d704899716e97e59af8b6fe5f549e0229eda6':
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 09:29:05 -07:00
Jeff Sharkey
dc8d704899 Merge changes I7277880e,Ia5584bd6 into klp-dev 
* changes:
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 16:26:34 +00:00
Wink Saville
78f4e10bb2 am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit 'a1d6a9b474ba095860838c6ed3e72f8d9f5058cd':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:25:32 -07:00
Wink Saville
a1d6a9b474 am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit 'fc7a146b82774514bad4bc307489ece7ac27ee50':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:19:40 -07:00
Wink Saville
fc7a146b82 am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:17:19 -07:00
Wink Saville
50f864480d am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:12:50 -07:00
Wink Saville
59a9884bf8 Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 2013-09-06 16:09:36 +00:00
Lajos Molnar
a67a4439ca MediaPlayer.MTP: fix issue when main thread had no looper 
We fall back to using the application's main looper similarly to MP,
and even create our own looper if MP was created outside of an
application context.  Always creating our own looper is a waste
of resources.

Also resolved issue with MP.reset() when created outside of an
application context, and removed MP.MTP's unused getHandler().

Change-Id: I9c3b8a2f05a9e231ae9c008bc1a48d6b991cec1d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10634238
 2013-09-06 08:53:20 -07:00
Jeff Sharkey
911d7f411f Provide calling package to ContentProviders. 
The calling package is important for ContentProviders that want to
grant Uri permissions as a side effect of operations, so offer it
through a new API.  Validates the provided package against the
calling UID before returning.

Bug: 10626527
Change-Id: I7277880eebbd48444c024bcf5f69199133cd59e4
 2013-09-06 08:08:18 -07:00
Jeff Sharkey
a61dc8e03e Separate root and document management. 
Two hidden intents for managing roots and documents, used to support
Downloads UI.  Touching an item tries launching as MANAGE_DOCUMENT
first before falling back to VIEW.  Provide MIME type for roots.

Bug: 10446265, 10531347, 10599641
Change-Id: Ia5584bd6ce3e5a9b0048e8caf1447e3053664413
 2013-09-06 08:08:18 -07:00
Mikhail Naganov
708d279a16 am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev 
* commit '498a5f5488446e1d5914f5d335ee02572c6201d1':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
 2013-09-06 07:41:08 -07:00
Mikhail Naganov
498a5f5488 Merge "Add more docs for WebView's setInitialScale and setLoadWithOverviewMode" into klp-dev 2013-09-06 14:36:29 +00:00
Baligh Uddin
ddde9617d6 am f96b104a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f96b104a7f6e4c2a8883b6d4de69e6de24aa8edc':
  Import translations. DO NOT MERGE
 2013-09-05 22:00:50 -07:00
Baligh Uddin
f96b104a7f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-06 04:56:22 +00:00
Lorenzo Colitti
6bddc31755 am eadf1959: Merge "Track IP addresses in WifiStateMachine." into klp-dev 
* commit 'eadf1959fbe2602f2c2b64ab0c4cd71a57d4f98c':
  Track IP addresses in WifiStateMachine.
 2013-09-05 20:32:32 -07:00
Lorenzo Colitti
eadf1959fb Merge "Track IP addresses in WifiStateMachine." into klp-dev 2013-09-06 03:30:15 +00:00
Mathias Agopian
97f0aa6f8a tweak the electron beam animation a bit 
we make the "beam" vanish in the center of the screen.

Bug: 10641933

Change-Id: I61fdb4d46e9f62dc80d65356a884dff0b177384a
 2013-09-05 18:58:51 -07:00
Michael Wright
f17e8ee379 am 86974463: Merge "Added support for supports-input manifest element" into klp-dev 
* commit '86974463e9e28108e14fa255efd3c429358c0605':
  Added support for supports-input manifest element
 2013-09-05 18:31:04 -07:00
Michael Wright
86974463e9 Merge "Added support for supports-input manifest element" into klp-dev 2013-09-06 01:29:35 +00:00
Michael Wright
eaeb190486 Added support for supports-input manifest element 
Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
 2013-09-05 18:15:57 -07:00
Svetoslav
833384ba11 am 23e2bba4: Merge "Spooler broken on upgrade." into klp-dev 
* commit '23e2bba4e17662e941c2c6672f66249aff4a0470':
  Spooler broken on upgrade.
 2013-09-05 17:05:14 -07:00
Svetoslav
23e2bba4e1 Merge "Spooler broken on upgrade." into klp-dev 2013-09-06 00:00:22 +00:00
Alan Viverette
47361ddd0a am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 16:40:39 -07:00
Alan Viverette
0ccef4d003 Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 2013-09-05 23:36:18 +00:00