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

153764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309 Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 2014-10-07 18:11:21 +00:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:33:25 +00:00
John Spurlock
2c52c443dc am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
 2014-10-07 17:33:10 +00:00
Jean-Michel Trivi
986468a8ab am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
  Full volume on remote submix for apps that need it
 2014-10-07 17:33:05 +00:00
PauloftheWest
f7b7b7585a am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 17:31:39 +00:00
Yorke Lee
84e9479a09 am 7f22eb98: Merge "Fix build break" into lmp-dev 
* commit '7f22eb981812309a1e751a891428dffe6b1da175':
  Fix build break
 2014-10-07 17:31:19 +00:00
Tyler Gunn
4afc6afd20 Fixing where call goes from disconnecting to active to disconnecting state. 
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).

Bug: 17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
 2014-10-07 10:14:55 -07:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
0d334365c6 Merge "Doze: Avoid pulsing in pockets." into lmp-dev 2014-10-07 16:17:46 +00:00
Jean-Michel Trivi
dce7a42759 Merge "Full volume on remote submix for apps that need it" into lmp-dev 2014-10-07 16:12:08 +00:00
Jean-Michel Trivi
ba5270b887 Full volume on remote submix for apps that need it 
If an AudioRecord is created with the "fixedVolume" tag
  when recording from REMOTE_SUBMIX, treat the
  device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
  device during the recording. Also register a death
  handler during the recording.
  Otherwise this is a no-op.

Bug 17635294

Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
 2014-10-07 09:09:41 -07:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets. 
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
 2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Yorke Lee
770ed6ec92 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
 2014-10-07 03:13:12 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Yorke Lee
7f22eb9818 Merge "Fix build break" into lmp-dev 2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
 2014-10-06 18:58:52 -07:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
Amit Mahajan
69555fc2c8 Merge "Sms7BitEncodingTranslator" into lmp-dev 2014-10-07 01:20:27 +00:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator 
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
 2014-10-07 01:02:04 +00:00
Christopher Tate
406abd4547 Accept any restored wallpaper 
...and let the wallpaper service & hosts figure out what to do
with it.

Bug 17677006

Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
 2014-10-06 18:00:51 -07:00
Yorke Lee
7e552595bd am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 
* commit '4c334f3def076d2940b53641c932050b1e4ce286':
  Add ability to add sim-initiated MO call to UI (2/4)
 2014-10-07 00:58:47 +00:00
Yorke Lee
4c334f3def Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 2014-10-07 00:54:52 +00:00
Jeff Sharkey
1d5ef81e29 am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
  Reduce PackageInstaller I/O pressure.
 2014-10-06 23:59:43 +00:00
Geoff Mendal
6a6369b61a am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fc8d65197a6404a93f1230ac5ebc635438a5c094':
  Import translations. DO NOT MERGE
 2014-10-06 23:52:31 +00:00
Raluca Sauciuc
f35c305f45 am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev 
* commit '6a3faf5a8b182d20dea47fb76cf33456321ddf7a':
  Fix test framework to allow Mockito tests to run successfully on ART.
 2014-10-06 23:52:19 +00:00
Paul Jensen
69c489ed6f am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-06 23:52:12 +00:00
Jeff Sharkey
99586dc010 Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 2014-10-06 23:51:56 +00:00
Geoff Mendal
1d593ad474 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 23:39:12 +00:00
Jeff Sharkey
02bd78490d Reduce PackageInstaller I/O pressure. 
When performing a restore during initial device setup, we could be
installing hundreds of packages.  Currently, we're writing all
metadata (including heavy icons) for every session mutation!  Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.

This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.

Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
 2014-10-06 16:38:15 -07:00
Geoff Mendal
fc8d65197a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 23:28:23 +00:00
Raluca Sauciuc
6a3faf5a8b Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev 2014-10-06 23:19:12 +00:00
Andres Morales
052690540e Remove dead NFC unlock code from fw/base 
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
 2014-10-06 16:04:19 -07:00
Paul Jensen
7627d2cd5c Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 2014-10-06 23:01:27 +00:00
Chris Craik
1a6c41fbad am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-06 22:35:19 +00:00
Mike Lockwood
3df6b76c5f am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev 
* commit '56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
  Add support for playing audio during bootanimation
 2014-10-06 22:35:13 +00:00
Mathieu Chartier
405a934ec4 am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev 
* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
  Fix incorrect JNI_ABORT
 2014-10-06 22:35:09 +00:00
Wei Liu
a940f8656d Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 2014-10-06 22:10:33 +00:00
Yorke Lee
c3cf982d18 Add ability to add sim-initiated MO call to UI (2/4) 
Add supporting (hidden) APIs to TelecomManager to add the ability to
add a previous unknown call to Telecom

Bug: 17787391

Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435
 2014-10-06 15:09:00 -07:00
Chris Craik
6c9f0a0160 Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 2014-10-06 22:06:23 +00:00
Geoff Mendal
295c3cabb2 Import translations. DO NOT MERGE 
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
 2014-10-06 15:04:49 -07:00
Geoff Mendal
c6da9afdcc Import translations. DO NOT MERGE 
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
 2014-10-06 14:55:42 -07:00
Chris Craik
f791703f9b Avoid changeBounds animations on Views that are not yet laidout 
bug:17683930

This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.

Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
 2014-10-06 14:55:17 -07:00