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

124638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bart Sears
7f9503267c am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit 'e31c05296d8cde8f6d99f18ef039fd6823ec54a9':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 20:29:43 +00:00
Christopher Tate
83b607a332 Merge "Don't hang installs if the transport disappears" 2014-03-03 20:22:23 +00:00
Tim Murray
9f141fbb78 am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc':
  Fix null check for BaseObj.equals.
 2014-03-03 20:21:27 +00:00
Christopher Tate
5c38516e83 Don't hang installs if the transport disappears 
Bug 12991308

Change-Id: Ie5d3d27fe565dd4014976f5333e37b5707acb707
 2014-03-03 12:03:09 -08:00
Chris Craik
8bc1868ab8 Merge "Improve isolatedZVolume test" 2014-03-03 19:44:49 +00:00
Chris Craik
6dbca96f08 Improve isolatedZVolume test 
Shows interleaving effect better

Change-Id: I85361b15587306484dc8fa6d6366e866014c270f
 2014-03-03 11:43:43 -08:00
Yuhao Zheng
9070484e17 Return detailed reason of invalid proxy settings 
Make Proxy.validate() return valid/invalid int code, instead of throwing
exceptions. If invalid, detailed reason code is returned (currently for
Settings UI use).

bug: 13248097
Change-Id: Ic68d03f666f1cd63667afc311de7dc370d233901
 2014-03-03 11:23:07 -08:00
Chris Wren
00ba32cdc8 Merge "add missing tablet asset for heads up" 2014-03-03 19:19:59 +00:00
Chris Wren
ee39eb59b1 add missing tablet asset for heads up 
Bug: 13280212
Change-Id: I8af2ba7dd2efba6bcb55e0e7d65dae49850aed06
 2014-03-03 14:13:06 -05:00
Tim Murray
fb51a4301c am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.
 2014-03-03 11:12:01 -08:00
Tim Murray
8377a4fd03 Merge "Fix null check for BaseObj.equals." 2014-03-03 19:09:08 +00:00
Tom O'Neill
923c0dc070 Discourage content observers on LOCATION_PROVIDERS_ALLOWED 
- Bug: 12176905

Change-Id: I79bfdbba5ad0d11d82169c0897418f5b3963be0a
 2014-03-03 11:07:55 -08:00
Jonathan Dixon
7c01f9f7ab am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master 
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

Cherry pick to klp-dev as part of Bug: 13246014
 2014-03-03 18:48:00 +00:00
Bart Sears
4e1bf73202 Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 2014-03-03 18:42:28 +00:00
John Spurlock
6ef3c2cbbb Merge "Handle non-exact measure passes in ZenModeView." 2014-03-03 18:41:45 +00:00
John Spurlock
756fa2ab9f Handle non-exact measure passes in ZenModeView. 
Bug:13245581
Change-Id: I2c5f6632fde6559849e6f429d66c4d28d4d3a890
 2014-03-03 13:38:01 -05:00
Tom O'Neill
248ada68cc Injected settings no longer include summaries 
- Bug: 13279850

Change-Id: I0fd1e60b2a56c45776963c29bbae6f176fdf1bea
 2014-03-03 10:30:36 -08:00
Robert Greenwalt
d49f64c605 Only apply tcp buffer sizes for default net 
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I3ef1a17ccde05306d786729c4369a31f78b2ebcf
 2014-03-03 10:26:11 -08:00
Baligh Uddin
a13cbe0dc4 Import translations. DO NOT MERGE 
Change-Id: Ifb1c03421b24b86339ea33cbe14aeeff9bba31f5
Auto-generated-cl: translation import
 2014-03-03 10:07:44 -08:00
Kenny Guy
08488bf3fe Allow user to be started in background. 
Change-Id: I2adeb258cd33765a559c1f952c47088abbc4336c
 2014-03-03 18:06:29 +00:00
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
 2014-03-03 18:01:53 +00:00
rich cannings
2c965bc5ef am 0e063f1e: am 3cff3474: am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '0e063f1e8aa71e03e5eea1cd56f555d78b7f2279':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:39:48 +00:00
John Spurlock
9abfa111a3 am 388eece1: am d708b2f1: am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '388eece1eae65d460d1cd29afe1ac9df79bf2885':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:39:44 +00:00
rich cannings
0e063f1e8a am 3cff3474: am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '3cff34742aa4f4b305b2edc462a369355b2e75da':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:35:14 +00:00
rich cannings
3cff34742a am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '341e6b73e6362f8757717a2518b370724c3a3913':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:31:35 +00:00
rich cannings
341e6b73e6 am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'fd6d8a8b736568ccb61af10dec04a99a8c36f29a':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:28:21 +00:00
rich cannings
fd6d8a8b73 am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'bc4d34dd8e5cfdccede6aefb163fe2283785c5b0':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:24:59 +00:00
rich cannings
bc4d34dd8e am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:21:58 +00:00
rich cannings
8ebfbffcbb Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 2014-03-03 17:19:02 +00:00
Patrick Tjin
36c96866f3 Merge "Fix typo in documentation" 2014-03-03 17:16:01 +00:00
John Spurlock
388eece1ea am d708b2f1: am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit 'd708b2f12bb8e85e34ac28d3d905e9701a554cfd':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:10:31 +00:00
John Spurlock
d708b2f12b am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit 'e3a6a7b4693e6efd29f973c8cfe91f5778f847f4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:07:22 +00:00
John Spurlock
e3a6a7b469 am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '841aa8db20d09d80cd71ef2ed8eaebd4ebccfcc5':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:04:01 +00:00
John Spurlock
841aa8db20 am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '5237a792aabaa49063b15cefa26f0341ea9cd311':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:00:49 +00:00
John Spurlock
5237a792aa am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 16:57:22 +00:00
Adrian Roos
6d22d75cba Keyguard Analytics: Remove unused constant. 
Change-Id: I6fce6640e391d5f78468212aac7d14a8a6170115
 2014-03-03 17:53:44 +01:00
Victoria Lease
2b96157f92 Add casual/cursive/sans-serif-smallcaps font families. 
Bug: 12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
 2014-03-03 08:50:46 -08:00
Adrian Roos
58b58fe68b Add session analytics to Keyguard. 
On eng and userdebug builds, adds the possibility to track touch and sensor events on the Keyguard.

Change-Id: I9ff9fe5545cb9b7e6833a6af0b5a97a6c204dbd2
 2014-03-03 17:09:27 +01:00
Chris Wren
1cdd7dda61 enable heads up notifications 
Bug: 13208692
Change-Id: I3682ecb30c6997c578b76a578b79a8d13a6e6323
 2014-03-03 10:15:53 -05:00
Chris Wren
10d82dfbfb rename heads up global setting: base part 
Bug: 13208692
Change-Id: Ia020e4d63552ab4b8cbb8a37622c36776800a790
 2014-03-03 10:15:53 -05:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter. 
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
 2014-03-03 10:14:41 -05:00
Yohei Yukawa
c18cd393f6 Make sure InputMethodInfo implements Parcelable transitively 
This CL adds one more test to make sure InputMethodInfo
implements Parcelable correctly. This test makes sure that
one can marshall and unmarshall again from an unmarshalled
copy of InputMethodInfo.

BUG: 12954290
Change-Id: I5aa1552a8089fe0bac54513ba224e5bfc494be97
 2014-03-03 14:14:10 +09:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge 
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
 2014-03-01 18:07:22 +00:00
Ying Wang
03c6628f40 am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:35:54 +00:00
Ying Wang
04c5bcf2bb am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '160c39d8a53793cb17dd8a9312d56eafced3cc0d':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:32:49 +00:00
Ying Wang
160c39d8a5 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:30:34 +00:00
Ying Wang
26026c6278 am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit 'dd72b6e76c5d5e819809bd3d2ef4ff6f700af759':
  Fix indirect misuse of $(my-dir).
 2014-03-01 09:27:42 -08:00
Ying Wang
dd72b6e76c Merge "Fix indirect misuse of $(my-dir)." 2014-03-01 17:25:10 +00:00