188672 Commits

Author SHA1 Message Date
Tyler Gunn
df2cbc8989 API Cleanup - rename IConferenceable to Conferenceable.
Bug: 20165255
Change-Id: If4cb323749b6ef9e8657506434d760d07c34167f
2015-04-20 09:13:01 -07:00
Chris Watkins
56d16568c0 Merge "Unhide the android.media.[Media]DataSource interface." 2015-04-16 17:06:46 +00:00
Yorke Lee
a22a09666b Merge "Change hasVoicemailNumber to getVoicemailNumber" 2015-04-16 17:05:19 +00:00
Mady Mellor
8d572dd1e2 Merge "New listener to recognize stylus button press gesture in GestureDetector" 2015-04-16 16:55:07 +00:00
Mady Mellor
241e119679 Merge "Recognize stylus touch + press button as a longpress in AbsListView" 2015-04-16 16:54:41 +00:00
Ben Kwa
f8f80c8034 Merge "Fix cancellation of copy jobs." 2015-04-16 16:45:29 +00:00
Ben Kwa
94ac0d7d30 Fix cancellation of copy jobs.
Add FLAG_CANCEL_CURRENT to the pending intent for cancellation, to
prevent reuse of previously created cancellation intents.  Previously
created intents have non-matching job IDs, which causes the cancellation
intent to be ignored.

BUG=20221969

Change-Id: Ie0afcc6af53a550b44bc4b2f3d48942cdb092a65
2015-04-16 09:43:41 -07:00
Yorke Lee
49e2d46812 Change hasVoicemailNumber to getVoicemailNumber
Bug: 20223485

Change-Id: I67eb12e2030ec8f73326ade4eb750b0c2f6e52ad
2015-04-16 09:30:57 -07:00
Lorenzo Colitti
3f2631f526 Merge changes from topic 'wifi-alternate-reality'
* changes:
  Pin a process to wifi when it calls enableNetwork(..., true)
  Make CALLBACK_PRECHECK actually work.
2015-04-16 16:11:22 +00:00
Robert Greenwalt
064ce64758 Merge "LCE service implementation - connectivity side" 2015-04-16 15:28:04 +00:00
Lorenzo Colitti
1022dde719 Pin a process to wifi when it calls enableNetwork(..., true)
Bug: 20081183
Change-Id: I12bbda1061bbebeb4d0844d0b0d7f51237645958
2015-04-17 00:26:46 +09:00
John Spurlock
7e54b30ef9 Merge "Volume: Automute in seek bar volumizer." 2015-04-16 15:10:33 +00:00
John Spurlock
721d457685 Volume: Automute in seek bar volumizer.
Never disable the slider, allow mutebusting and syncing mute to 0
value.

Also add new framework icon for media.

Bug: 20096341
Change-Id: I9db1671c3442365866a49c9d6f7becf0b2e05435
2015-04-16 11:01:15 -04:00
John Reck
8560630596 Merge "Remove Bitmap#getSkBitmap" 2015-04-16 14:29:21 +00:00
Andrew Flynn
64e605a5be Merge "SysUI: Carrier Network Change icon" 2015-04-16 13:15:02 +00:00
Geoff Mendal
b300d6930a Import translations. DO NOT MERGE
Change-Id: Ib81a9725011568bacb0250dac5a59b50450209fc
Auto-generated-cl: translation import
2015-04-16 05:54:43 -07:00
Andrew Flynn
a478d70a68 SysUI: Carrier Network Change icon
- Listen for new PhoneStateListener.CARRIER_NETWORK_CHANGE events.
- Show/hide a new unique animated icon in status bar and quick settings during
  Carrier Network Change events if we are instructed by PhoneStateListener
  and it's during a period without connectivity.
- ObjectAnimator doesn't let you animate colors between themed colors, so
  there's quite a bit of boilerplate duplication in the animation xml.
- Add a new demo mode command to toggle it on/off.

Change-Id: Ic5bb2aa7444303c6b7f2456526a9c25325c6e1f4
2015-04-16 08:37:43 -04:00
Abodunrinwa Toki
5925a910f9 Merge "Style floating toolbar." 2015-04-16 10:53:09 +00:00
Clara Bayarri
1809427647 Merge "Editor: keep text selection when starting a process text intent." 2015-04-16 10:14:37 +00:00
Gustav Sennton
c82a99d5f7 Merge "Load WebView from one out of a list of packages." 2015-04-16 10:14:04 +00:00
John Spurlock
dd5b1f5f2f Mark sysui string reference as untranslatable.
Bug: 19260237
Change-Id: I4a2267462ece1d21ced0156cb1e99be913ea2ada
2015-04-16 06:04:00 -04:00
fenglu
b15e72b83c LCE service implementation - connectivity side
Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
2015-04-16 02:53:39 -07:00
Lorenzo Colitti
bdc4549dcd Make CALLBACK_PRECHECK actually work.
Currently, CALLBACK_PRECHECK is never fired, because we attempt
to send it just after a network has connected, before matching
requests to that network. So notifyNetworkCallbacks scans the
list of requests for the network, finds none, and does nothing.

Bug: 20038463
Change-Id: Ib0c6377c45990e358f926217d7c7defa74c1d59b
2015-04-16 17:11:09 +09:00
Yorke Lee
6a30835551 Fix make update-api
Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
2015-04-15 23:46:03 -07:00
Casper Bonde
2a5f608e7a Add support for Bluetooth Sim Access Profile (2/4)
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
2015-04-15 23:45:51 -07:00
Nitin Arora
d055adbe2c Bluetooth LE background operation mode (2/2)
Changes include new framework APIs to enable and disable Bluetooth LE
separately from Bluetooth Classic. Along with handling the new states
in the Bluetooth manager service.

Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
2015-04-15 23:45:30 -07:00
Jeff Sharkey
bd3af28fdc Merge "Candidate volumes for packages, fix symlink." 2015-04-16 05:50:16 +00:00
Jeff Sharkey
e2d45be4da Candidate volumes for packages, fix symlink.
Add API to determine the possible candidate volumes that a package
can be moved to.  For example, it currently knows that we need to
move ASEC-based apps through internal storage before migrating them
to a private volume.

Comparator for consistent VolumeInfo ordering when displayed in UI.

Fix native library symlink to be volume UUID aware.

Bug: 19993667
Change-Id: I68d5fac5f0f776ac1c7dd15e7a984bfe2704f3f7
2015-04-15 22:21:49 -07:00
Vinit Deshpande
dae67ef343 Merge "TelephonyManager Carrier Network Change Notification" 2015-04-16 04:43:21 +00:00
Daichi Hirono
ff9ab66d42 Merge "DocumentsUI: Hide pick button of copy destination picker for read only directory." 2015-04-16 03:34:35 +00:00
Adam Lesinski
85229422d5 Merge "Fix up the command line, add flags." 2015-04-16 03:31:25 +00:00
Adam Lesinski
5886a92eb6 Fix up the command line, add flags.
Change-Id: I420bd0212fc7541668bd095b88295564d3d11f6c
2015-04-15 20:29:48 -07:00
Wei Jia
03b3dccffe Merge "MediaSync: pass the error code of setPlaybackRate from native code to JAVA." 2015-04-16 03:05:38 +00:00
Adam Lesinski
01c1de5806 Merge "AAPT2: Add library support" 2015-04-16 03:04:43 +00:00
Adam Lesinski
769de98f2d AAPT2: Add library support
Change-Id: I307f56d9631784ab29ee4156d94886f9b2f25b30
2015-04-15 19:56:59 -07:00
Miao Wang
68e03ab998 am 13391109: am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '133911095ce0d9ef01766aa7b67a0a31b852e242':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:46:43 +00:00
Vinit Deshpande
cb43ebb360 Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release" 2015-04-16 02:36:30 +00:00
Miao Wang
133911095c am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '2b300a99bbb133090b7ec39e64dd65ba2bb8f18d':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:32:59 +00:00
Miao Wang
2b300a99bb am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '782b43394ef48e7cf8e75404c534a46074d42d4e':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:21:37 +00:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Raph Levien
7400df9487 Merge "Add left and right indent arrays to TextView" 2015-04-16 02:00:03 +00:00
Raph Levien
e319d5a362 Add left and right indent arrays to TextView
In support of layout of paragraphs to non-rectangular regions, add
arrays for left and right indents to TextView, along with supporting
StaticLayout builder setters.

Bug: 20182243
Change-Id: I015bcef8f258c89001fcf8a54c179d2dfc0d7943
2015-04-15 18:57:53 -07:00
Adrian Roos
81af4733b5 Merge "Fix lockscreen bugs with SHOW_WHEN_LOCKED" 2015-04-16 01:50:22 +00:00
Adrian Roos
f253eeb9d3 Fix lockscreen bugs with SHOW_WHEN_LOCKED
When unlocking to a SHOW_WHEN_LOCKED activity by clicking
a notification, we don't get a the startKeyguardExitAnimation
because Keyguard is not actually going away. Instead, we start
it ourselves.

Also fixes the bug where restarting Keyguard while it's occluded
lead to an inconsistent state where the user got stuck on the
lockscreen.

Bug: 16481924
Change-Id: Iebc5bdd1287bbb81415ae01c7428850acc16c53f
2015-04-16 01:49:25 +00:00
Zheng Fu
01ea304ff0 Merge "Add setting flag to enable contact metadata syncing in CP2" 2015-04-16 01:35:40 +00:00
John Spurlock
a419dd1616 Merge "Zen: Add notification policy management api." 2015-04-16 01:19:27 +00:00
Wale Ogunwale
4ff26a7de4 Merge "Updated javadoc for persistRootOnly attribute." 2015-04-16 01:18:00 +00:00
Andres Morales
4062c69d9a Merge "Make CryptoObject constructor public" 2015-04-16 01:08:44 +00:00
Wei Jia
0feab71799 MediaSync: pass the error code of setPlaybackRate from native code to JAVA.
Bug: 19666434
Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
2015-04-15 18:06:08 -07:00
Ronghua Wu
a05b54ff8f Merge "media: add reason to CodecException ctor." 2015-04-16 01:04:33 +00:00