149155 Commits

Author SHA1 Message Date
Yohei Yukawa
72d35fa829 Reject request when any unknown flag is speficied
Currently EditableInputConnection#requestUpdateCursorAnchorInfo
never returns false unless InputMethodManager is somehow
unavailable.

This is problematic, especifially when we add a new flag to
EditableInputConnection#requestUpdateCursorAnchorInfo in a
future release.

With this CL, #requestUpdateCursorAnchorInfo does nothing and
immediately returns false when one ore more unknown bits are
specified.

BUG: 17324806
Change-Id: I5601714b481e8efa0ad3337c0d093cfcf55eade3
2014-08-29 00:57:19 -07:00
Adam Lesinski
b32063822b Merge "Stamp platform version code into app Apks" into lmp-dev 2014-08-29 01:54:15 +00:00
Jeff Tinker
67085e1cac Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 2014-08-29 01:45:25 +00:00
Svetoslav
85933eb18b Merge "Print UI polish." into lmp-dev 2014-08-29 01:18:00 +00:00
Dongwon Kang
13d43b927f Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 2014-08-29 01:08:50 +00:00
Dianne Hackborn
3d07395206 Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 2014-08-29 00:56:49 +00:00
Dianne Hackborn
ecf1cda068 Debug issue #17310019: pause when launching settings
Let's log!

Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
2014-08-28 17:52:33 -07:00
Svetoslav
43da1d4a08 Merge "Fix app widget serices not being unbound." into lmp-dev 2014-08-29 00:51:49 +00:00
Svetoslav
2635b7b0d3 Fix app widget serices not being unbound.
bug:17321037

Change-Id: I44578df1104f9bd2e28700a3422a3323844d92c0
2014-08-28 17:41:49 -07:00
Alex Light
e545035e0e Remove obsolete pruneDexCache
Bug: 16875245

(cherry picked from commit 09107db4916913912e61bfe592643b9c4c50b500)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 17:02:37 -07:00
Alex Light
55471dcd0f Change /dalvik-cache to be owned by root.
Bug: 16875245

(cherry picked from commit 79bf4007f559e194205f632b23d2bfb6f8d1e7ba)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 17:02:37 -07:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
2014-08-29 08:58:30 +09:00
Dongwon Kang
371bee50f9 Merge "TIF: cosmetic changes for consistency." into lmp-dev 2014-08-28 23:49:33 +00:00
Dongwon Kang
fd8aa02d73 TIF: cosmetic changes for consistency.
- Remove uncessarry logic in buildTvInputListLocked().
  (No longer needed because we removed availability.
   Verified the bug case, b/15738607, does not happen without this logic.)
- Rename member variables in XXXState classes.
- Define SessionCallback for consistency.

Change-Id: I49642c909ad7f77d97d1d90670c7bb7c2b12cda8
2014-08-29 08:48:02 +09:00
RoboErik
6a6a8f0094 Fix test build
Updates for MediaBrowser APIs. I missed some new demos that had been added which use
these APIs.

Change-Id: Ic42c9ba20a851c5b08c564cfc4de71bbe09ebdb9
2014-08-28 23:37:22 +00:00
Jeff Sharkey
d6b03eecf0 Merge "Teach API lint about package layering!" into lmp-dev 2014-08-28 23:36:25 +00:00
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +00:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
6276cd4b8d Fix NPE when transitioning on unattached scene root.
Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
2014-08-28 16:17:38 -07:00
Jeff Sharkey
932a07cefe Teach API lint about package layering!
Now it can identify layering violations, like when something deep in
android.os depends on android.app.

Change-Id: I94606c642195b3ed7558ff6979ed4a181cd85fa2
2014-08-28 16:16:07 -07:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly.
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
2014-08-28 16:11:49 -07:00
John Reck
80068b735e Merge "Track buildLayer calls, destroy if unused" into lmp-dev 2014-08-28 23:04:32 +00:00
Raph Levien
7de5c43c80 Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 2014-08-28 22:59:08 +00:00
RoboErik
f87fcf9716 Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 2014-08-28 22:56:08 +00:00
Chris Craik
6fc6014a24 Merge "Support Z reorder/shadows in root render node" into lmp-dev 2014-08-28 22:55:48 +00:00
John Reck
998a6d8189 Track buildLayer calls, destroy if unused
Bug: 17208461

Change-Id: Ibdb104a493285d77a6891c5e74e38a52c7014da9
2014-08-28 15:55:26 -07:00
RoboErik
fd63dd0ce2 Add javadoc to Window.set/getMediaController
Fleshes out the javadoc a bit more instead of just a reference to
the description of the methods in Activity.

bug:17198774
Change-Id: I24afe1c5d9f2e46e201c84072a6b34a619867889
2014-08-28 22:53:34 +00:00
Alan Viverette
76d149a587 Merge "Fix docs build" into lmp-dev 2014-08-28 22:51:48 +00:00
Eino-Ville Talvala
509f777730 Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 2014-08-28 22:48:55 +00:00
Alan Viverette
9adfa37cfe Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 2014-08-28 22:39:27 +00:00
Diego Pontoriero
921db7e1de Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 2014-08-28 22:38:50 +00:00
Jeff Sharkey
7f208bfcfd Merge "Lint tool for current.txt." into lmp-dev 2014-08-28 22:33:01 +00:00
Jeff Sharkey
8190f4885b Lint tool for current.txt.
Detects common public API mistakes, making it easy to quickly scan
across all changes in a new API level.

Builds in-memory representation of the current API, then runs various
detectors over the classes.  It collects failures, and can ignore
known failures from a previous API level.

Example usage:

$ python frameworks/base/tools/apilint/apilint.py \
    frameworks/base/api/current.txt \
    prebuilts/sdk/api/21.txt

Change-Id: Ie1f88894baf9f79e4b11e78c47f848ea5e25fc25
2014-08-28 15:31:35 -07:00
Alan Viverette
40ce070714 Fix docs build
Change-Id: Id7b961ebcfffe536992208a157f625b5a1b1e1b6
2014-08-28 15:27:04 -07:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
Chris Craik
abedca3983 Support Z reorder/shadows in root render node
bug:17310188
Change-Id: If2281218c458cf767d79b4d81944e2c8a23ca32c
2014-08-28 15:03:55 -07:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
PauloftheWest
2f2ea058db Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 2014-08-28 21:37:20 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
2014-08-28 14:19:25 -07:00
Winson Chung
bb6c033351 Merge "Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)" into lmp-dev 2014-08-28 21:14:22 +00:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
2014-08-28 21:11:22 +00:00
Alan Viverette
b1b267114c Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 2014-08-28 21:05:04 +00:00
Shaohan Zou
18b80d2a0d Merge "Add Media Player Streaming Tests" into lmp-dev 2014-08-28 21:00:33 +00:00
Kenny Guy
a734fc1ece Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
Change-Id: I10bcb60abe3450f2ecfb3ee305be505e13e0be3b
2014-08-28 13:58:29 -07:00
Alan Viverette
f023c2530a Update action bar item widths, overflow menu, button, and spinner styles
Manually modifies the overflow button hotspot bounds so that the ripple
appears to be centered on the overflow icon. Adds styleable and parsing
for list popup window offsets. Updates spinner text appearance to be
consistent with drop down item text appearance. Also updates horizontal
inner padding in buttons.

BUG: 17305079
BUG: 17304391
BUG: 17302567
Change-Id: Iafddfef290078de968894a3b443ba9f60f84c6d4
2014-08-28 13:55:18 -07:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Diego Pontoriero
3892fc0349 Change TelephonyManager method name to accurately reflect functionality.
Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
2014-08-28 13:50:36 -07:00
Chris Craik
12b500959d Merge "Force translucency for inset windows" into lmp-dev 2014-08-28 20:49:06 +00:00