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

112824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
c022ee7ace am c91be711: am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev 
* commit 'c91be7119e817f76f175da46ac26468fcb29b632':
  Another asset drop, provider icons, tests.
 2013-09-06 14:03:06 -07:00
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
81a0cb158b am c268c442: am f0ac3a6b: Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 
* commit 'c268c442a154800c0a2fd3199fa4798b3dbb284c':
  Fix issue #10650718: Camera DOA on KLP
 2013-09-06 13:51:00 -07:00
Victoria Lease
2139aa255e am dfd7e1d3: am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev 
* commit 'dfd7e1d3e9f47854baaf63a2a1a836c3a2c4b276':
  add NotoSansSymbols to fallback chain
 2013-09-06 13:46:25 -07:00
Mathias Agopian
84e6ccf790 am e669c7ac: am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev 
* commit 'e669c7aca3c02b9991d5a1cfcad40b5ae48faab2':
  tweak the electron beam animation a bit
 2013-09-06 13:46:22 -07:00
Dianne Hackborn
2949d1af93 am 5e615ee5: am a4796d51: Merge "Fix to show correct duration." into klp-dev 
* commit '5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424':
  Fix to show correct duration.
 2013-09-06 13:46:18 -07:00
Igor Murashkin
a94db2467c am 76f883e0: am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '76f883e0a8fa6d62110824399440c779a1b68874':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:46:16 -07: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
0cb1a791d8 am 435f957f: am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit '435f957feef58a4d393f06f57db3975633d6b09b':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 13:32:51 -07:00
David Christie
8f7b2e5683 am 8b0c6c22: 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 
* commit '8b0c6c22a296d50ee120148a9e6d4b586f454f23':
  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 13:32:49 -07:00
Chris Craik
0ff8c5f33c am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev 
* commit '9b824560726eab653a1044eecdb0bfe5ff804865':
  Dump the right matrix when logging display lists
 2013-09-06 13:32:45 -07:00
Lajos Molnar
f096f93872 am 3ec449e0: am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 
* commit '3ec449e0814dbb0baa518bc05372bbb3154c2e9f':
  MediaPlayer.MTP: fix issue when main thread had no looper
 2013-09-06 13:32:43 -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
9c395c8e26 am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev 
* commit '6a3b7db257db3e8c6be834fe69859bf2465af380':
  Fix duplicate SSID entries in the WifiSettings UI
 2013-09-06 10:31:31 -07: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
a53fb42f31 am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev 
* commit '775bdbdb11ad790f45ee66e8fdf8dca3fcba969a':
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 09:53:04 -07:00
Wink Saville
010bbf42ff am 78f4e10b: am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '78f4e10bb206acc13095a6daeb880751fb28f313':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:53:01 -07:00
Mikhail Naganov
1b48d039d3 am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev 
* commit '708d279a16e2c937da1a2247195eb738906c199e':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
 2013-09-06 09:52:49 -07:00
Baligh Uddin
c55a29c45e am ddde9617: (-s ours) am f96b104a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ddde9617d62df82107252a23dc75988f67939678':
  Import translations. DO NOT MERGE
 2013-09-06 09:52:34 -07:00
Lorenzo Colitti
551624c46c am 6bddc317: am eadf1959: Merge "Track IP addresses in WifiStateMachine." into klp-dev 
* commit '6bddc317554b43818e625519e094e0381859db82':
  Track IP addresses in WifiStateMachine.
 2013-09-06 09:52:12 -07:00
Michael Wright
6484c0e013 Merge addition of supports-input tag into master 
aapt has been moved out of f/b which caused merged conflicts in
the original commit

Conflicts:
	tools/aapt/Command.cpp

Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b
 2013-09-06 09:39:34 -07: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