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

113056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alan Viverette
bbf4962a45 Increase visibility of accessibility focus highlight 
Swaps old 9-patch for a Shape with a 2dp stroke and standard 2dp
rounded corner.

BUG: 9076619
Change-Id: I7486facb77c52209348830edf4eea318b1d90608
 2013-09-06 11:19:26 -07: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
Wink Saville
4fea0413c1 Tighten test for warm sim and add more debug. 
- Require a non-204 response multiple times before declaring a
redirected error and hence a warm sim.

- If there is no connection or dns don't declare its a warm-sim.

- Add printing of the http headers to try to get more information
if we still get a false positive result.


Bug: 9972012
Change-Id: Ic115685cdbbe39c2b4de88b128eaf8d2ea96b45c
 2013-09-06 09:54:24 -07: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
Matthew Williams
abc1d89950 Merge "Fix broken javadocs" 2013-09-06 16:06:17 +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
Narayan Kamath
a2bcee619d Remove synchronization in WifiMonitorSingleton. 
This isn't really required because the static initializer
for WifiMonitorSingleton won't run until the first access
to the (non primitive) static field "sInstance". Further,
static initializers will be run precisely once (i.e
first accesses to sInstance from multiple threads are safe).

Change-Id: I78fae225e4c5cb917e7e7817522595ae026daf47
 2013-09-06 09:21:10 +00:00
Svetoslav
204831a79e am 833384ba: am 23e2bba4: Merge "Spooler broken on upgrade." into klp-dev 
* commit '833384ba110a2310f5462df7a42749fc1ce78820':
  Spooler broken on upgrade.
 2013-09-05 23:52:21 -07:00
Alan Viverette
589759ff1d am 47361ddd: am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '47361ddd0a507c687bc92b2d5baeae221a2df493':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 23:52:12 -07:00
Baligh Uddin
c106683094 am b3d69bf9: (-s ours) am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b3d69bf95eece256c05aea029a7f6ebf3f0fcd26':
  Import translations. DO NOT MERGE
 2013-09-05 23:52:07 -07:00
John Spurlock
27c68786ec am 773dd9d5: am bd847601: Merge "Remove opaque-on-interaction from nav bar." into klp-dev 
* commit '773dd9d58b42257c0d571b9d18236a2da99517ca':
  Remove opaque-on-interaction from nav bar.
 2013-09-05 23:52:01 -07:00
Christopher Tate
48103dc3f9 am abe49daf: am 8fe79f66: Merge "Turn off verbose wakeup-alarm stats" into klp-dev 
* commit 'abe49dafa0de201520589249083a5274d16b5287':
  Turn off verbose wakeup-alarm stats
 2013-09-05 23:51:56 -07:00
Lorenzo Colitti
db8b920fe9 am cf712202: am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev 
* commit 'cf71220223a4c4c7f2ac1e3340c8aa0cffa5f4cf':
  Add a function to replace all the link addresses.
 2013-09-05 23:51:53 -07: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
55635416a4 Merge "Import translations. DO NOT MERGE" 2013-09-06 04:56:32 +00: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
Amith Yamasani
cd57b4950f am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit '3d27c9f973b1dd35ed457785b452851316cdca8a':
  Remove unused APIs and rename others based on API review
 2013-09-05 17:33:19 -07:00