Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,337 Commits 3 Branches 0 Tags
81356bb398874688593cba4118a4994804483a1d
Commit Graph

38826 Commits

Author SHA1 Message Date
Eino-Ville Talvala
81356bb398 am b79b4307: Merge "CameraDevice: Make sure log tags are within length bounds." 
* commit 'b79b4307983c43614a5cd35a08c8444493abae79':
  CameraDevice: Make sure log tags are within length bounds.
 2014-04-28 22:33:57 +00:00
Eino-Ville Talvala
967c4354be Merge "CameraDevice: Make sure log tags are within length bounds." 2014-04-28 22:28:55 +00:00
Eino-Ville Talvala
b72d1efdef CameraDevice: Make sure log tags are within length bounds. 
Change-Id: I93c4670c1ee0b0be5956b0ed8cd0f53873257f7c
 2014-04-28 15:23:43 -07:00
Yorke Lee
fedd55a424 am a6521d78: Merge "Add setOverlay method to QuickContactsBadge" 
* commit 'a6521d78a4ce3c273b241eed214c85ec12a30d32':
  Add setOverlay method to QuickContactsBadge
 2014-04-28 21:31:31 +00:00
Griff Hazen
48f04a845b am 58ba9f2d: am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '58ba9f2db123e216a262fae5e276ec9f394e42f8':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:31:24 +00:00
Adam Lesinski
448b130c12 am d15388df: Merge "Merge commit \'734a78fb\' into manualmerge" 
* commit 'd15388dfe12938c95f52aba1cb41ec58ad1e5e84':
  Various CTS fixes
 2014-04-28 21:31:21 +00:00
Yorke Lee
2e9c300b91 Merge "Add setOverlay method to QuickContactsBadge" 2014-04-28 21:24:21 +00:00
Bo Liu
3a915af6a2 am caffba94: Merge "Add invokeFunctor call to ViewRootImpl" 
* commit 'caffba94e9e7cf8a798675b05815e578cbe72ffd':
  Add invokeFunctor call to ViewRootImpl
 2014-04-28 21:22:17 +00:00
Elliott Hughes
d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master 
* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.
 2014-04-28 21:22:01 +00:00
Griff Hazen
7c12112d62 am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit 'e638b84436caeea8d54b560c0b883ef599ba328d':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:21:10 +00:00
Adam Lesinski
1ebf4ef188 Merge "Merge commit '734a78fb' into manualmerge" 2014-04-28 21:20:01 +00:00
Bo Liu
802667b20b Merge "Add invokeFunctor call to ViewRootImpl" 2014-04-28 21:16:14 +00:00
Adam Lesinski
e929bee9bb Merge commit '734a78fb' into manualmerge 
Conflicts:
	core/java/android/app/WallpaperManager.java

Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
 2014-04-28 14:15:06 -07:00
Yorke Lee
a702ccdf9f Add setOverlay method to QuickContactsBadge 
Allow apps to disable/configure their own overlay to be used
on the QuickContactsBadge

Bug: 13747208

Change-Id: Id84c6ee1ebde6ce17477c12d22522ca19c27ea9b
 2014-04-28 13:57:04 -07:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
 2014-04-28 13:53:25 -07:00
Bo Liu
ae738a7a45 Add invokeFunctor call to ViewRootImpl 
BUG: 13961296

Change-Id: Ief8eea0b4c79a64ea76d75daaec176f1b8438581
 2014-04-28 13:41:18 -07:00
Yohei Yukawa
8f6278df67 am 5fe51516: Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 
* commit '5fe51516d07dc1a4fb54c968b7f11c4a6f4b8cbf':
  Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
 2014-04-28 20:38:21 +00:00
Mathieu Chartier
d122c94931 am d4b2046e: am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit 'd4b2046efbfa300263df5c0901b7b24c97bf11cd':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 20:38:15 +00:00
Yohei Yukawa
2fe02f8a6e am a11b97b4: Merge "Return the cursor position in screen coordinates" 
* commit 'a11b97b4c7fea2fb1c61fa74c217db789a0f9e54':
  Return the cursor position in screen coordinates
 2014-04-28 20:38:03 +00:00
Dianne Hackborn
99a58b0e3a am c60f1877: Merge "Rework some of the voice interaction APIs." 
* commit 'c60f1877896e795a6add525ee36770e3aa77dc29':
  Rework some of the voice interaction APIs.
 2014-04-28 20:37:33 +00:00
Griff Hazen
e638b84436 am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:37:24 +00:00
Yohei Yukawa
b609ea3884 Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 2014-04-28 20:33:26 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev 
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
 2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:29:12 +00:00
Mathieu Chartier
ce4c6218a6 am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit 'c6d0dc896438d8918f4f985513e92be9b4d69e87':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 20:03:38 +00:00
Yohei Yukawa
c644ff6d4f Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT 
This is a follow-up CL for I3acf2317ae1d763d11 to improve the
Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT

BUG: 14323360
Change-Id: Ie8948eda3ce57da282bd82e8e9a44997f6d53245
 2014-04-29 05:01:08 +09:00
Yohei Yukawa
985fd3063c Merge "Return the cursor position in screen coordinates" 2014-04-28 19:17:05 +00:00
Yohei Yukawa
4de04795f9 Return the cursor position in screen coordinates 
From its beginning, InputMethodService#onUpdateCursor has
provided the cursor position in local coordinates in the attached
view. However, the local coordinates is not useful for IMEs
to render a floating UI near the cursor because the IME is not
able to know the origin of the attached view.

With this CL, CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT also means
that the IME will receive the cursor position in screen
coordinates. Because this is a new constant in the next release,
conditionally changing the coordinates never causes
compatibility issues as long as its behavior is well documented.

BUG: 14323360
Change-Id: I3acf2317ae1d763d11dae5ef73c2a1348b377c71
 2014-04-29 03:53:34 +09:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Mathieu Chartier
c6d0dc8964 am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit '18582a827c3f908cd75e1d9c189c554f42415a4a':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 18:36:44 +00:00
Dianne Hackborn
fb875cb028 Merge "Rework some of the voice interaction APIs." 2014-04-28 18:28:06 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS. 
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
 2014-04-28 11:07:22 -07:00
Dianne Hackborn
18f0d357f9 Rework some of the voice interaction APIs. 
On the app side, requests are now composed by subclassing
from various types of Request objects.

On the service side, starting a voice interaction session
involves starting another service that will then manage the
session.  This leads the service design much more to what
we want, where the long-running main service is very tiny
and all the heavy-weight transient session work is elsewhere
in another process.

Change-Id: I46c074c6fe27b6c1cf2583c6d216aed1de2f1143
 2014-04-28 10:54:15 -07:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
 2014-04-28 10:32:21 -07:00
George Mount
cbc13e3fb1 am 4407ad5f: Merge "Fade Transition sometimes disappeared improperly." 
* commit '4407ad5ffcaf25600810248c2332c368d294016b':
  Fade Transition sometimes disappeared improperly.
 2014-04-28 17:29:06 +00:00
George Mount
80c1210e59 Merge "Fade Transition sometimes disappeared improperly." 2014-04-28 17:23:53 +00:00
Jeff Sharkey
8407fdb37e am 143ae9f7: Define action used to show regulatory info. 
* commit '143ae9f760fd86c8d3f96665268375601beea0b2':
  Define action used to show regulatory info.
 2014-04-28 16:41:48 +00:00
Jeff Sharkey
c4414e4336 am 9446dc8c: Allow custom wallpaper and boot animation. 
* commit '9446dc8c0486d2db219b4b268d9f491a2ee6b555':
  Allow custom wallpaper and boot animation.
 2014-04-28 16:37:35 +00:00
Jeff Sharkey
6966f78968 am b8948a2f: Gracefully handle long fingerprints. 
* commit 'b8948a2f76dc6a76d8a7b3a9b2b4408ff6a6be42':
  Gracefully handle long fingerprints.
 2014-04-28 16:37:31 +00:00
Jeff Sharkey
da0c19e48a am 076d36fd: Derive fingerprint at runtime when undefined. 
* commit '076d36fd94c83ac72b9a16e3ddba0e7a331b00e1':
  Derive fingerprint at runtime when undefined.
 2014-04-28 16:37:28 +00:00
Jeff Sharkey
dd77fdacca Define action used to show regulatory info. 
Bug: 13340779
Change-Id: I90abb3574797e4b258d32440a2434ae8a7be2949
 2014-04-28 08:54:17 -07:00
Jeff Sharkey
28f0877073 Allow custom wallpaper and boot animation. 
Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources.  Falls back to bundled resources when properties are
undefined.

Also look for boot animation under OEM partition.

Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
 2014-04-28 08:54:17 -07:00
Jeff Sharkey
bdd4491b32 Gracefully handle long fingerprints. 
Otherwise derived fingerprints longer than the maximum system property
size put the device into a crash loop.

Bug: 13983493
Change-Id: I8a88e71b1fd396f1cd63b414e3a62bb25010430c
 2014-04-28 08:54:16 -07:00
Jeff Sharkey
5568772e81 Derive fingerprint at runtime when undefined. 
Some devices leave "ro.build.fingerprint" undefined at build time,
since they need to build it from the components at runtime.

Bug: 13340779
Change-Id: I4d74398817af22079a11c196dc6742b85d2bfb61
 2014-04-28 08:54:16 -07:00
Chris Wren
1a024628cf am 97773efe: Merge "Remove opPkg from the notification key." 
* commit '97773efef70b199fefc954c4a0de368fd5fb17dd':
  Remove opPkg from the notification key.
 2014-04-28 15:08:59 +00:00
Chris Wren
01c70711d5 Merge "Remove opPkg from the notification key." 2014-04-28 15:03:17 +00:00