30176 Commits

Author SHA1 Message Date
Dianne Hackborn
2ed9c20048 Merge "Add new signature-level permission to get details of tasks." 2012-04-24 15:42:26 -07:00
Gilles Debunne
2d373a1834 TextView refactoring part 3: the easy
Removed safety net getEditor() method.
Cleaned-up trailing spaces.
Enforced the 100 characters limit on all lines.

Change-Id: I0e0d704f8b795cd2e2d040f31c20e63c60fa31a8
2012-04-24 15:25:43 -07:00
Irfan Sheriff
c1da08f1ae Merge "Expose Context.NSD_SERVICE" 2012-04-24 15:13:03 -07:00
Irfan Sheriff
60309fc7bb Expose Context.NSD_SERVICE
Missed exposing Context.NSD_SERVICE for the network service
discovery API

Change-Id: I38cfa93e923286072ded05b707d31cd4db7ff7d4
2012-04-24 14:57:46 -07:00
Chris Craik
912507928c Merge "Support picture listener correctly in HW webviews" 2012-04-24 14:49:51 -07:00
Dianne Hackborn
8238e717df Add new signature-level permission to get details of tasks.
Third party apps now can't get access to the extras of the
intents associated with tasks, to keep private data in them
from leaking out.

Change-Id: I95af9e181ac42557bc8b981807e7ddd266a88d0e
2012-04-24 14:27:02 -07:00
John Reck
4961295d19 Merge "Use the right timeout" 2012-04-24 14:18:17 -07:00
John Reck
d7156d3f47 Use the right timeout
oops

Change-Id: I667b849af4c5d4fece42e9bcbc5b6b9951b955bb
2012-04-24 14:14:47 -07:00
Steve Block
2318889909 Merge "Add tests for reflection and improve JavaDoc for Java Bridge" 2012-04-24 14:11:26 -07:00
Dianne Hackborn
dc5f9b7530 am 0172264b: am 294374bf: am 5e542108: Merge "Remove deprecation on android:enabled attribute."
* commit '0172264bda0b3b018815cb4cdf26b00ccb7d7fe5':
  Remove deprecation on android:enabled attribute.
2012-04-24 13:50:24 -07:00
Steve Block
3aa800b9f9 Add tests for reflection and improve JavaDoc for Java Bridge
Bug: 5461416
Change-Id: Ic339b97a9424d8848f8afd47ba00cbbee4d60c9d
2012-04-24 21:34:42 +01:00
Chris Wren
ab3333dcab Merge "Don't allow children of a SizeAdaptiveLayout to measure outside their declared range of valid sizes." 2012-04-24 13:16:05 -07:00
Chris Wren
54dfa5d90e Don't allow children of a SizeAdaptiveLayout to measure outside their declared range of valid sizes.
Bug: 6377749
Change-Id: Ie706006eee9c0ed8dda468212a652941b8e20be0
2012-04-24 16:14:31 -04:00
Jeff Sharkey
ce5a597e66 Merge "Disable READ_EXTERNAL enforcement until API level cut." 2012-04-24 13:10:32 -07:00
Jeff Sharkey
d776f617f5 Disable READ_EXTERNAL enforcement until API level cut.
Bug: 6389556
Change-Id: I78238b9de24c1b8ebb4fdc35d8aafd2e85a4adfe
2012-04-24 13:09:13 -07:00
Eric Fischer
3cfb680afe Merge "Import translations. DO NOT MERGE" 2012-04-24 13:05:29 -07:00
Eric Fischer
5d5440abeb Import translations. DO NOT MERGE
Change-Id: I256639001505523434884de60d949295152ed10d
2012-04-24 12:39:18 -07:00
Philip Milne
b2b15716d8 Merge "Promote layout debugging code from GridLayout to ViewGroup." 2012-04-24 11:36:54 -07:00
Gilles Debunne
0b7d747e90 Merge "Editor uses a SpanWatcher to track EasyEditSpans" 2012-04-24 11:27:32 -07:00
Chris Wren
db41553eaf Merge "actions on notifications should stack vertically." 2012-04-24 11:19:30 -07:00
Chris Wren
78db1064a7 actions on notifications should stack vertically.
Bug: 6317471
Change-Id: Ic49b7c3c95dd5033b380655fb5671433b13959ac
2012-04-24 14:15:41 -04:00
Glenn Kasten
df3ab4ab3d Merge "Scheduling policy service" 2012-04-24 11:02:55 -07:00
Glenn Kasten
07b0465095 Scheduling policy service
Change-Id: I6178b96896ffbb3323210f93784a65d724a3e694
2012-04-24 09:53:14 -07:00
Martijn Coenen
ba4dd937fe Merge "Allow enabling Bluetooth without auto-connecting." 2012-04-24 09:03:33 -07:00
Steve Block
f03f64d810 Merge "Update WebViewClassic JavaDoc to refer to WebView" 2012-04-24 03:22:27 -07:00
Steve Block
406aeb2a9d Update WebViewClassic JavaDoc to refer to WebView
Change-Id: I5152ce82111dc661e5dc723d5c3402f2765b7312
2012-04-24 11:20:29 +01:00
Jonathan Dixon
26ed99f3f5 Merge "static methods in CookieManger call via instance" 2012-04-24 03:01:55 -07:00
Jonathan Dixon
be58c40646 static methods in CookieManger call via instance
This allows CookieManager subclasses to correctly override all behvaior
in the base class.

Bug: 6379925
Change-Id: Ife02db24bc192bc1eabf09e0d64668716786d237
2012-04-24 09:48:28 +01:00
Dianne Hackborn
5ba15cc38f am 9d9251c8: am 847d677f: am 3c40675f: Merge "Fix potential NPE when saving fragment state."
* commit '9d9251c8caee4a847b630653204bb205a1fbed09':
  Fix potential NPE when saving fragment state.
2012-04-23 21:49:40 -07:00
Dianne Hackborn
847d677f34 am 3c40675f: Merge "Fix potential NPE when saving fragment state."
* commit '3c40675f6f473896b93ca6416d29192d88e92622':
  Fix potential NPE when saving fragment state.
2012-04-23 21:44:43 -07:00
Svetoslav Ganov
76f287e416 Removing hierarchical accessibility focus directions.
1. The accessibility focus directions are not needed since an
   accessibility service just get the root, first child, next
   sibling, previous sibling and call execute the action to
   give it accessibility focus. Now the accessibility node
   info tree is properly ordered taking into account layout
   manager directions for both layout manager that we report
   and ones that we have determined as not important for
   accessibility. Also the position of a node info are ordered
   properly based on their coordinates after all transformations
   as opposed to child index.

bug:5932640

Change-Id: I994a8297cb1e57c829ecbac73a937c2bcbe0bac7
2012-04-23 20:48:24 -07:00
Romain Guy
5479e29121 Merge "I broke the build after all... here's a fix." 2012-04-23 20:46:04 -07:00
Romain Guy
d4caee0e50 I broke the build after all... here's a fix.
Change-Id: I970715fcff5a74a0ce272654c2ea79e4ab3684bf
2012-04-23 20:44:04 -07:00
Adam Powell
b6ad9d9205 Merge "Don't launch ACTION_QUICK_CONTACT activities in a new task." 2012-04-23 20:38:34 -07:00
Romain Guy
ba6be8a62d Prevent WebView from crashing when detached from the window
Bug #6365056

WebView enqueues a functor in the hardware renderer to handle
animations and this functor is called at a later time by the
hardware renderer. However, the functor was not removed from
the queue when WebView was removed from the window. This could
cause the hardware renderer to attempt to execute an invalid
functor and lead to a crash.

Change-Id: I9d38e80f3fdc5e29d4d0cdfa1e893c251a954508
2012-04-23 20:29:31 -07:00
Adam Powell
619ffd70b1 Don't launch ACTION_QUICK_CONTACT activities in a new task.
Change-Id: Ib6ea6da88cd8addbc02398c29bb7a0b455b02bda
2012-04-23 19:22:46 -07:00
Maurice Chu
88fffb7a34 Merge "Fix build breakage resulting from change id: Ia1038f45" 2012-04-23 19:06:09 -07:00
Maurice Chu
2dfba0e6cf Fix build breakage resulting from change id: Ia1038f45
Corrected adding a backslash before apostrophes in the strings.xml file.

Change-Id: I83574042184c9abb78409441ddf2d0e58a68f207
2012-04-23 19:03:13 -07:00
Jake Wharton
258029eeaa Fix potential NPE when saving fragment state.
If a fragment's saved view state is null and the user
visible hint is true then the `result` bundle will have
never been initialized to a value resulting in a
`NullPointerException`.

Mirrors support library change I8ba585bc6b9298841490d64bc22a8219cd261adb.

Change-Id: Iabd5ac293d2ece3771da9ef257479eca0dcd523c
2012-04-23 18:54:27 -07:00
Gilles Debunne
8b48244668 Merge "Centered text is not updated" 2012-04-23 18:31:22 -07:00
Gilles Debunne
c62589cbec Editor uses a SpanWatcher to track EasyEditSpans
Will also fix Bug 6344997

The previous TextWatcher mechanism was inneficient. It require an
expensive getSpans() call to retrieve all the spans and then search
for the one we're interested in in case it has been changed.

The SpanWatcher is faster, it will broadcast the add/changed/removed
events we're interested in.

Now that we can rely on SpanWatcher, use it to directly track
addition and removals of EasyEditSpans.

No unit test for this feature which require an integration with
the voice IME. Easy to test manually though.

Change-Id: Idabcacc48c479bf9868d5204c0b0ca709207ede2
2012-04-23 18:25:25 -07:00
Gilles Debunne
9177947741 Merge "Fixed SSB. Correct broadcast of removed spans' positions" 2012-04-23 18:17:30 -07:00
Maurice Chu
395d725ff4 Merge "Changed the description of android.permission.READ_CONTACTS" 2012-04-23 17:56:07 -07:00
Maurice Chu
8aae6a8e94 Changed the description of android.permission.READ_CONTACTS
Bug:6141955
Change-Id: Ia1038f45d4f72358446ec265130bb34f8b228f82
2012-04-23 17:34:59 -07:00
Glenn Kasten
2427a4c49e Merge "Scheduling group cleanup" 2012-04-23 17:11:55 -07:00
Gilles Debunne
fb9f5be318 Centered text is not updated
Bug 6378843

Emergency fix. May submit a proper fix with less translations later.

Change-Id: I9d8348e29d5436580202d3ee0456d341bf81dab8
2012-04-23 16:51:29 -07:00
Philip Milne
10ca24a97c Promote layout debugging code from GridLayout to ViewGroup.
Layout debugging code draws rectangles around:

1. Layout insets (red)
2. Bounds (blue)
3. Margins (magenta)

Layout debug mode is enabled with:

adb shell setprop debug.layout true

Change-Id: Ia155a2d0fbf33693a1e3c040f627ea3a534e1aff
2012-04-23 16:41:04 -07:00
Martijn Coenen
6c614b7e59 Allow enabling Bluetooth without auto-connecting.
This is a feature used for NFC-to-Bluetooth handover:
we want to enable BT for file transfer, and disconnect
it when we're done. During this period we don't want
to auto-connect other devices - it should be transparent
to the user that Bluetooth is used. Also, don't allow
A2DP/HSP incoming connections.

Change-Id: I0a03e8084c439b1271b6a80f4d9da5aacfe19c45
2012-04-23 16:25:30 -07:00
Gilles Debunne
b983e27af4 Merge "Re-added a flag to prevent the IME from showing" 2012-04-23 15:53:37 -07:00
Glenn Kasten
f1b56449f5 Scheduling group cleanup
The C++ API for scheduling groups is going away, so use the C API.

Renumber THREAD_GROUP_* constants to have the same values as SP_*.
They are @hide so this should be OK.

The old THREAD_GROUP_FG_BOOST constant is removed, and replaced by a
(private) THREAD_GROUP_FOREGROUND constant that is just a placeholder
to correspond to SP_FOREGROUND.  It is not usable at this level.

Improved performance of android_os_Process_setProcessGroup:
avoid unnecessary syscall to getpriority for each tid.

Fixed error handling in android_os_Process_setThreadGroup.
It raises an exception if set_sched_policy() returns an error.

Add comments and fix typos in existing comments.

Change-Id: Ib922e92c945985c695ef0addbd2b83b8e82865f8
2012-04-23 15:30:02 -07:00