OSDN Git Service

android-x86/frameworks-base.git
9 years agoam ab258139: BluetoothSap class should not be public
Andre Eisenbach [Tue, 5 May 2015 00:58:04 +0000 (00:58 +0000)]
am ab258139: BluetoothSap class should not be public

* commit 'ab2581398c812917145088590bd18eb83f3a2ea6':
  BluetoothSap class should not be public

9 years agoam 73b4a330: Merge "MediaSync: clean up configureAudioTrack and configureSurface...
Wei Jia [Tue, 5 May 2015 00:58:00 +0000 (00:58 +0000)]
am 73b4a330: Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

* commit '73b4a3303ed97860d4a4c0795afd680aa5158d4e':
  MediaSync: clean up configureAudioTrack and configureSurface.

9 years agoam 2dc05e22: am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer...
Joe Fernandez [Tue, 5 May 2015 00:57:53 +0000 (00:57 +0000)]
am 2dc05e22: am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit '2dc05e22bdbebe3f276391a743f525b0e1a2504e':
  docs: Android Developer Dashboard update - May 2015

9 years agoam 3b7af8c9: am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs...
Rich Slogar [Tue, 5 May 2015 00:57:49 +0000 (00:57 +0000)]
am 3b7af8c9: am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '3b7af8c9b4e5e76c9fe3fcda08cc7cfeff906683':

9 years agoam 41ef6ba4: am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image...
Dirk Dougherty [Tue, 5 May 2015 00:57:44 +0000 (00:57 +0000)]
am 41ef6ba4: am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.

* commit '41ef6ba4ce330718c71db503788943067b5b62a9':
  Update N6 device art port image to remove shadow.

9 years agoam d5aa39cc: am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0...
Rich Slogar [Tue, 5 May 2015 00:57:40 +0000 (00:57 +0000)]
am d5aa39cc: am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit 'd5aa39cc0aab9b6175ebafd87eed6894ac4d949f':
  docs: sdk 24.2.0 revisions

9 years agoam ed4331d2: am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton...
Joe Fernandez [Tue, 5 May 2015 00:57:36 +0000 (00:57 +0000)]
am ed4331d2: am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs

* commit 'ed4331d29a63b30293bb2176712c491c65190623':
  docs: M Preview mini site skeleton

9 years agoam 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
George Mount [Tue, 5 May 2015 00:57:32 +0000 (00:57 +0000)]
am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

* commit '57436d3f7e7fca99400a9b90e93491e892d135ae':
  Fix potential NPE in internal isValidTarget method.

9 years agoam f455986a: Add documentation for BluetoothSocket.getConnectionType()
Andre Eisenbach [Tue, 5 May 2015 00:57:27 +0000 (00:57 +0000)]
am f455986a: Add documentation for BluetoothSocket.getConnectionType()

* commit 'f455986a45328614c8dd07a4d60a30b9ddc3d994':
  Add documentation for BluetoothSocket.getConnectionType()

9 years agoam c81af1ca: Merge "When returning, transition only existing shared elements." into...
George Mount [Tue, 5 May 2015 00:57:23 +0000 (00:57 +0000)]
am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev

* commit 'c81af1ca7838f79ecc39fe0a9bf269880fa515e5':
  When returning, transition only existing shared elements.

9 years agoam 0425de31: Merge "eliminate notification clicker garbage." into mnc-dev
Chris Wren [Tue, 5 May 2015 00:57:19 +0000 (00:57 +0000)]
am 0425de31: Merge "eliminate notification clicker garbage." into mnc-dev

* commit '0425de31cf9a2ad8e5883c64d27dc2ee90d0377c':
  eliminate notification clicker garbage.

9 years agoam 5c33a2e3: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into...
Sanket Padawe [Tue, 5 May 2015 00:57:15 +0000 (00:57 +0000)]
am 5c33a2e3: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev

* commit '5c33a2e3ecf3c495e00614029df917e0754d7397':
  Adding "Connected, no Internet" string in Wifi nw summary.

9 years agoam 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev
George Mount [Tue, 5 May 2015 00:57:10 +0000 (00:57 +0000)]
am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev

* commit '61bab469a1529ef61cadb870ca4cc533a5510cfb':
  Fix Visibility not changing until Animator ends.

9 years agoam 394f9360: Merge "More documentation for handling RippleDrawable mask at run time...
Alan Viverette [Tue, 5 May 2015 00:57:06 +0000 (00:57 +0000)]
am 394f9360: Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev

* commit '394f9360c91c588fb1630f2d6af65fabe4c241a6':
  More documentation for handling RippleDrawable mask at run time

9 years agoam 8ef631de: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Tue, 5 May 2015 00:57:02 +0000 (00:57 +0000)]
am 8ef631de: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

* commit '8ef631de47d4e52cafe5f9182633892b480dfcdb':
  Add user selectable Default Browser feature - part 4

9 years agoam d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev
Alan Viverette [Tue, 5 May 2015 00:56:57 +0000 (00:56 +0000)]
am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev

* commit 'd38d3574d0b1905d41891c2d7f89892ab13803ae':
  Always force constructors accessible during inflation

9 years agoam ad2399f3: Merge "Zen: Implement calendar event system condition provider." into...
John Spurlock [Tue, 5 May 2015 00:56:53 +0000 (00:56 +0000)]
am ad2399f3: Merge "Zen: Implement calendar event system condition provider." into mnc-dev

* commit 'ad2399f3be4861d0f5acf072460d98fafc951c57':
  Zen: Implement calendar event system condition provider.

9 years agoam 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev
Jeff Sharkey [Tue, 5 May 2015 00:56:48 +0000 (00:56 +0000)]
am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev

* commit '5f809e3fff2b4c6c94d966ceb93e6cf74fe9813b':
  Avoid NPE when fsUuid is null.

9 years agoBluetoothSap class should not be public
Andre Eisenbach [Mon, 4 May 2015 20:28:04 +0000 (13:28 -0700)]
BluetoothSap class should not be public

Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67

9 years agoMerge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev
Wei Jia [Mon, 4 May 2015 23:14:15 +0000 (23:14 +0000)]
Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

9 years agoMediaSync: clean up configureAudioTrack and configureSurface.
Wei Jia [Mon, 4 May 2015 22:59:20 +0000 (15:59 -0700)]
MediaSync: clean up configureAudioTrack and configureSurface.

Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d

9 years agoam 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard updat...
Joe Fernandez [Mon, 4 May 2015 22:19:56 +0000 (22:19 +0000)]
am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit '722b509df505c156c71e95336b8059b8afcd8621':
  docs: Android Developer Dashboard update - May 2015

9 years agoam 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0...
Rich Slogar [Mon, 4 May 2015 22:19:46 +0000 (22:19 +0000)]
am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '0d13312552030dce0499fd9201c8e17b92aa8a4d':

9 years agoam fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove...
Dirk Dougherty [Mon, 4 May 2015 22:19:39 +0000 (22:19 +0000)]
am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.

* commit 'fd92db9c843042ab66f76d11a733493819d8c2c9':
  Update N6 device art port image to remove shadow.

9 years agoam 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions
Rich Slogar [Mon, 4 May 2015 22:19:33 +0000 (22:19 +0000)]
am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '5bf92cbab9e6df7fb918c925fd506737a9e25c4e':
  docs: sdk 24.2.0 revisions

9 years agoam 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview...
Joe Fernandez [Mon, 4 May 2015 22:19:23 +0000 (22:19 +0000)]
am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs

* commit '419aff0fd39c565d52c21a845e346c691f3ec4fb':
  docs: M Preview mini site skeleton

9 years agoMerge "Fix potential NPE in internal isValidTarget method." into mnc-dev
George Mount [Mon, 4 May 2015 22:08:02 +0000 (22:08 +0000)]
Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

9 years agoFix potential NPE in internal isValidTarget method.
George Mount [Mon, 4 May 2015 22:01:55 +0000 (15:01 -0700)]
Fix potential NPE in internal isValidTarget method.

Bug 19805383

Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd

9 years agoAdd documentation for BluetoothSocket.getConnectionType()
Andre Eisenbach [Mon, 4 May 2015 20:48:50 +0000 (13:48 -0700)]
Add documentation for BluetoothSocket.getConnectionType()

Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b

9 years agoMerge "When returning, transition only existing shared elements." into mnc-dev
George Mount [Mon, 4 May 2015 21:48:52 +0000 (21:48 +0000)]
Merge "When returning, transition only existing shared elements." into mnc-dev

9 years agoWhen returning, transition only existing shared elements.
George Mount [Mon, 4 May 2015 21:12:40 +0000 (14:12 -0700)]
When returning, transition only existing shared elements.

Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b

9 years agoMerge "eliminate notification clicker garbage." into mnc-dev
Chris Wren [Mon, 4 May 2015 21:06:16 +0000 (21:06 +0000)]
Merge "eliminate notification clicker garbage." into mnc-dev

9 years agoeliminate notification clicker garbage.
Chris Wren [Fri, 1 May 2015 14:39:26 +0000 (10:39 -0400)]
eliminate notification clicker garbage.

Bug: 9739772
Change-Id: If05079cb0f956e03f26c7780c318452f73c3e849

9 years agoMerge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
Sanket Padawe [Mon, 4 May 2015 20:44:51 +0000 (20:44 +0000)]
Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev

9 years agoMerge "Fix Visibility not changing until Animator ends." into mnc-dev
George Mount [Mon, 4 May 2015 20:26:47 +0000 (20:26 +0000)]
Merge "Fix Visibility not changing until Animator ends." into mnc-dev

9 years agoMerge "More documentation for handling RippleDrawable mask at run time" into mnc-dev
Alan Viverette [Mon, 4 May 2015 20:10:19 +0000 (20:10 +0000)]
Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev

9 years agoMerge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Mon, 4 May 2015 19:59:34 +0000 (19:59 +0000)]
Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

9 years agoMore documentation for handling RippleDrawable mask at run time
Alan Viverette [Mon, 4 May 2015 19:51:54 +0000 (12:51 -0700)]
More documentation for handling RippleDrawable mask at run time

The docs are now really explicit about the layer's ID and how to set
or update the mask layer from code.

Bug: 20493831
Change-Id: I801f10cd08fd1b4bb226c63a1bdf3271229928ea

9 years agoMerge "Always force constructors accessible during inflation" into mnc-dev
Alan Viverette [Mon, 4 May 2015 19:38:56 +0000 (19:38 +0000)]
Merge "Always force constructors accessible during inflation" into mnc-dev

9 years agoMerge "Zen: Implement calendar event system condition provider." into mnc-dev
John Spurlock [Mon, 4 May 2015 19:07:29 +0000 (19:07 +0000)]
Merge "Zen: Implement calendar event system condition provider." into mnc-dev

9 years agoMerge "Avoid NPE when fsUuid is null." into mnc-dev
Jeff Sharkey [Mon, 4 May 2015 19:06:38 +0000 (19:06 +0000)]
Merge "Avoid NPE when fsUuid is null." into mnc-dev

9 years agoAvoid NPE when fsUuid is null.
Jeff Sharkey [Mon, 4 May 2015 19:04:09 +0000 (12:04 -0700)]
Avoid NPE when fsUuid is null.

Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1

9 years agoFix Visibility not changing until Animator ends.
George Mount [Fri, 1 May 2015 21:27:45 +0000 (14:27 -0700)]
Fix Visibility not changing until Animator ends.

Sometimes an animator will be interrupted before it starts
during a transition and the onAnimatorEnd will not be called.
In this case, we must set the final state in the onTransitionEnd.

Bug 20416564

Change-Id: I388895215ba2b1c500de3a5afcae8db1fea288f7

9 years agoZen: Implement calendar event system condition provider.
John Spurlock [Mon, 4 May 2015 15:58:26 +0000 (11:58 -0400)]
Zen: Implement calendar event system condition provider.

 - Wire up basic implementation for the system provider that
   handles event-based DND subscriptions.
 - Backed by the standard system calendar content provider.
 - Move shared time utils to base class, clean up logging.

Bug: 20064962
Change-Id: I070b6baa580c592c2ab4101c6b44a254787f9dd7

9 years agoam e678b41c: Merge "Fix setName use-after-free" into mnc-dev
John Reck [Mon, 4 May 2015 17:42:26 +0000 (17:42 +0000)]
am e678b41c: Merge "Fix setName use-after-free" into mnc-dev

* commit 'e678b41cdb56847c094260607ea39aea4abb808e':
  Fix setName use-after-free

9 years agoMerge "Fix setName use-after-free" into mnc-dev
John Reck [Mon, 4 May 2015 17:35:32 +0000 (17:35 +0000)]
Merge "Fix setName use-after-free" into mnc-dev

9 years agoAlways force constructors accessible during inflation
Alan Viverette [Mon, 4 May 2015 17:32:57 +0000 (10:32 -0700)]
Always force constructors accessible during inflation

We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.

Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.

Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f

9 years agoam a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015...
Joe Fernandez [Mon, 4 May 2015 17:19:32 +0000 (17:19 +0000)]
am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit 'a246d2dd4bf8fd6e00561e234f4d2bd41f2f3b68':
  docs: Android Developer Dashboard update - May 2015

9 years agoam 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp...
Joe Fernandez [Mon, 4 May 2015 17:08:12 +0000 (17:08 +0000)]
am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit '9dabc784ee3fe1fd16bb9bc00eb8d3bafce2b078':
  docs: Android Developer Dashboard update - May 2015

9 years agoMerge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
Joe Fernandez [Mon, 4 May 2015 16:57:41 +0000 (16:57 +0000)]
Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

9 years agodocs: Android Developer Dashboard update - May 2015
Joe Fernandez [Sat, 2 May 2015 00:32:39 +0000 (17:32 -0700)]
docs: Android Developer Dashboard update - May 2015

Change-Id: Ia4cfae39c0ccb744f9489615b6dd36f455a652c0

9 years agoFix setName use-after-free
John Reck [Mon, 4 May 2015 16:44:28 +0000 (09:44 -0700)]
Fix setName use-after-free

Bug: 20764439
Change-Id: I7a0f85bb82629b1302db02015fa493dc09eb31f7

9 years agoam 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support...
Jose Lima [Mon, 4 May 2015 16:37:25 +0000 (16:37 +0000)]
am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev

* commit '5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
  Move ContentInfoExtender from Notification.java to a support library

9 years agoam 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
Steve McKay [Mon, 4 May 2015 16:31:08 +0000 (16:31 +0000)]
am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev

* commit '5d2c1d54b953ac0e4243210237fec92e3105844e':
  Ensure sort menu is shown as needed.

9 years agoMerge "Move ContentInfoExtender from Notification.java to a support library" into...
Jose Lima [Mon, 4 May 2015 16:29:27 +0000 (16:29 +0000)]
Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev

9 years agoMerge "Ensure sort menu is shown as needed." into mnc-dev
Steve McKay [Mon, 4 May 2015 16:22:42 +0000 (16:22 +0000)]
Merge "Ensure sort menu is shown as needed." into mnc-dev

9 years agoEnsure sort menu is shown as needed.
Steve McKay [Thu, 30 Apr 2015 23:12:59 +0000 (16:12 -0700)]
Ensure sort menu is shown as needed.

This also hoists common code for options menu setup into BaseActivity.

Change-Id: Ie87b8188a6c142b2312c92dc0d0bd550f0b1e59f

9 years agoam cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 4 May 2015 14:53:50 +0000 (14:53 +0000)]
am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
  Import translations. DO NOT MERGE

9 years agoam ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
Andrew Flynn [Mon, 4 May 2015 14:53:46 +0000 (14:53 +0000)]
am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev

* commit 'ae499d19eb70a46f12d6d750c608b893951a118b':
  SystemUI Carrier Network Change unit tests

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 4 May 2015 14:44:11 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 14:43:39 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6371c9d043b9d5436804c4d755ecc6a645ff7119
Auto-generated-cl: translation import

9 years agoMerge "SystemUI Carrier Network Change unit tests" into mnc-dev
Andrew Flynn [Mon, 4 May 2015 14:43:19 +0000 (14:43 +0000)]
Merge "SystemUI Carrier Network Change unit tests" into mnc-dev

9 years agoam 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
John Reck [Mon, 4 May 2015 14:40:45 +0000 (14:40 +0000)]
am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev

* commit '05dc201ff64f6324c2726a8841af7021e7071b97':
  Remove Bitmap#getSkBitmap

9 years agoam 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
John Reck [Mon, 4 May 2015 14:40:41 +0000 (14:40 +0000)]
am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev

* commit '1641c0cb0b6baf313c82846fe4f64007078c604f':
  Move AssetAtlas off of SkBitmap*

9 years agoMerge "Remove Bitmap#getSkBitmap" into mnc-dev
John Reck [Mon, 4 May 2015 14:34:41 +0000 (14:34 +0000)]
Merge "Remove Bitmap#getSkBitmap" into mnc-dev

9 years agoMerge "Move AssetAtlas off of SkBitmap*" into mnc-dev
John Reck [Mon, 4 May 2015 14:34:38 +0000 (14:34 +0000)]
Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev

9 years agoam 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev
Tor Norbye [Mon, 4 May 2015 14:31:23 +0000 (14:31 +0000)]
am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev

* commit '335f043bdb20f3528f486ad91eb9e1fdf8f673ab':
  Add permission annotations on the AccountManager

9 years agoSystemUI Carrier Network Change unit tests
Andrew Flynn [Fri, 1 May 2015 15:50:07 +0000 (11:50 -0400)]
SystemUI Carrier Network Change unit tests

- Includes unit tests for verifying mobile data indicators.
- Found one bug where dark mode icon wasn't showing properly when
  different from light mode icon.
- Comment out failing test
  NetworkControllerSignalTest#testSetCurrentSubscriptions

Bug: 20288155
Change-Id: Ib3c9ba224c4187cab35d6bfa68f6bd4c489cf98e

9 years agoMerge "Add permission annotations on the AccountManager" into mnc-dev
Tor Norbye [Mon, 4 May 2015 14:19:18 +0000 (14:19 +0000)]
Merge "Add permission annotations on the AccountManager" into mnc-dev

9 years agoAdd permission annotations on the AccountManager
Tor Norbye [Thu, 23 Apr 2015 23:36:09 +0000 (16:36 -0700)]
Add permission annotations on the AccountManager

Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3

9 years agoam 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 12:37:42 +0000 (12:37 +0000)]
am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE

* commit '3f2f2cbbd643661f2a15defa9774eb4c6b27b2a5':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 12:11:09 +0000 (07:11 -0500)]
Import translations. DO NOT MERGE

Change-Id: I1ece3421339dabd55a0c586e9ffd961cf7e3de56
Auto-generated-cl: translation import

9 years agoam 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev
Lorenzo Colitti [Mon, 4 May 2015 01:10:28 +0000 (01:10 +0000)]
am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev

* commit '0fdf7eee6792140b453931c1100c1ff2d60b641e':
  Add a status bar icon for Ethernet.

9 years agoMerge "Add a status bar icon for Ethernet." into mnc-dev
Lorenzo Colitti [Mon, 4 May 2015 01:01:47 +0000 (01:01 +0000)]
Merge "Add a status bar icon for Ethernet." into mnc-dev

9 years agoam 303650c9: Add full backup criteria to android manifest
Matthew Williams [Sun, 3 May 2015 23:30:52 +0000 (23:30 +0000)]
am 303650c9: Add full backup criteria to android manifest

* commit '303650c9cdb7cec88e7ec20747b161d9fff10719':
  Add full backup criteria to android manifest

9 years agoAdd full backup criteria to android manifest
Matthew Williams [Sat, 18 Apr 2015 01:22:51 +0000 (18:22 -0700)]
Add full backup criteria to android manifest

BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce

9 years agoam ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
Svet Ganov [Sun, 3 May 2015 00:50:34 +0000 (00:50 +0000)]
am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev

* commit 'ca030f8ed5fd52f2821d159b9c16d0c514dc0688':
  Add read cell broadcast app op - framework

9 years agoam e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
Svetoslav [Sun, 3 May 2015 00:50:30 +0000 (00:50 +0000)]
am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev

* commit 'e9fc4cda50664558028b79edd1f4b893cd4f52d3':
  Add camera app op - framework

9 years agoMerge "Add read cell broadcast app op - framework" into mnc-dev
Svet Ganov [Sun, 3 May 2015 00:44:13 +0000 (00:44 +0000)]
Merge "Add read cell broadcast app op - framework" into mnc-dev

9 years agoAdd read cell broadcast app op - framework
Svet Ganov [Sun, 3 May 2015 00:42:44 +0000 (17:42 -0700)]
Add read cell broadcast app op - framework

Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd

9 years agoMerge "Add camera app op - framework" into mnc-dev
Svetoslav [Sun, 3 May 2015 00:41:49 +0000 (00:41 +0000)]
Merge "Add camera app op - framework" into mnc-dev

9 years agoAdd camera app op - framework
Svetoslav [Fri, 1 May 2015 23:52:41 +0000 (16:52 -0700)]
Add camera app op - framework

Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0

9 years agoam 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages...
Mike Lockwood [Sat, 2 May 2015 16:21:02 +0000 (16:21 +0000)]
am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev

* commit '5ba44affe6747d2995030005bd99471d621d6e79':
  BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets

9 years agoMerge "BluetoothMidiService: Add support for sending SysEx messages that span multipl...
Mike Lockwood [Sat, 2 May 2015 16:09:45 +0000 (16:09 +0000)]
Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev

9 years agoam 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 06:38:16 +0000 (06:38 +0000)]
am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9eb25fad188e48fb3adafe1043f2014357cce898':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 06:29:54 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 2 May 2015 06:27:24 +0000 (23:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib21a9d53d30f304a1c82dc4f45e82f3fe27723bb
Auto-generated-cl: translation import

9 years agoam 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 04:36:02 +0000 (04:36 +0000)]
am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6b27f7899f5bf76c2cb7b0d0ff85605b23ac80d0':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 04:23:06 +0000 (04:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 2 May 2015 04:16:15 +0000 (23:16 -0500)]
Import translations. DO NOT MERGE

Change-Id: I982c3b51da747b06c157c947ca441dc641acb5d5
Auto-generated-cl: translation import

9 years agoam d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions
Rich Slogar [Sat, 2 May 2015 03:41:56 +0000 (03:41 +0000)]
am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit 'd3de33e9dfaee6c0336a51e774632813b3344fca':

9 years agoam 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
Lajos Molnar [Sat, 2 May 2015 02:27:09 +0000 (02:27 +0000)]
am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev

* commit '4971de2a2efe448171b87471ad65e986c3608c21':
  media: hook up MediaCodec.setSurface

9 years agoam 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into...
Chong Zhang [Sat, 2 May 2015 02:27:04 +0000 (02:27 +0000)]
am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev

* commit '039cd7ffaa28376fe00396b92dc77716bfa6e42e':
  MediaRecorderTest: test recording from persistent surface

9 years agoam 03359161: MediaRecorder: implement persistent input surface APIs
Chong Zhang [Sat, 2 May 2015 02:27:00 +0000 (02:27 +0000)]
am 03359161: MediaRecorder: implement persistent input surface APIs

* commit '03359161734eb0bdfacb6ff91be8617b9c5eccab':
  MediaRecorder: implement persistent input surface APIs

9 years agoam 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:26:55 +0000 (02:26 +0000)]
am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev

* commit '1d82220a0e6de28657c0882813571a70c383c22a':
  MediaCodec: implement persistent input surface APIs

9 years agoMerge "media: hook up MediaCodec.setSurface" into mnc-dev
Lajos Molnar [Sat, 2 May 2015 02:23:06 +0000 (02:23 +0000)]
Merge "media: hook up MediaCodec.setSurface" into mnc-dev

9 years agoMerge "MediaRecorderTest: test recording from persistent surface" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:20:46 +0000 (02:20 +0000)]
Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev

9 years agoMediaRecorder: implement persistent input surface APIs
Chong Zhang [Fri, 1 May 2015 19:50:30 +0000 (12:50 -0700)]
MediaRecorder: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866

9 years agoMerge "MediaCodec: implement persistent input surface APIs" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:14:36 +0000 (02:14 +0000)]
Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev

9 years agoAdd user selectable Default Browser feature - part 4
Fabrice Di Meglio [Sat, 2 May 2015 01:52:29 +0000 (18:52 -0700)]
Add user selectable Default Browser feature - part 4

- when selecting a default Browser App, make the others Browser Apps
not capable to open URLs automatically

See bug #20144393

Change-Id: I6ffaafbfb1a2571c0eba90af5c1648150b020559