OSDN Git Service

android-x86/frameworks-base.git
9 years agoam b3afbf6b: am f5c2de6f: am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permission...
Andrew Solovay [Tue, 26 May 2015 21:21:58 +0000 (21:21 +0000)]
am b3afbf6b: am f5c2de6f: am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit 'b3afbf6b99b8552c27d807ea14ac64897f4b76a2':
  docs: M Runtime Permissions overview.

9 years agoam c74d078b: am 8673f0c4: Merge "Don\'t leak starting window when app crashes before...
Wale Ogunwale [Tue, 26 May 2015 21:21:53 +0000 (21:21 +0000)]
am c74d078b: am 8673f0c4: Merge "Don\'t leak starting window when app crashes before adding windows" into mnc-dev

* commit 'c74d078b4e946fe5a28f4f415eb950c840a4c9ca':
  Don't leak starting window when app crashes before adding windows

9 years agoam 83b5fedb: am 707368b5: Merge "Add vvm type for t-mobile." into mnc-dev
Nancy Chen [Tue, 26 May 2015 21:21:48 +0000 (21:21 +0000)]
am 83b5fedb: am 707368b5: Merge "Add vvm type for t-mobile." into mnc-dev

* commit '83b5fedb5789954017d496eafe5879074e76fc30':
  Add vvm type for t-mobile.

9 years agoam b0fa2241: am d1e0b949: Merge "Add fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 21:21:43 +0000 (21:21 +0000)]
am b0fa2241: am d1e0b949: Merge "Add fingerprint icon" into mnc-dev

* commit 'b0fa22416370027f9134a23c94f09beb308ea2de':
  Add fingerprint icon

9 years agoam f5c2de6f: am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview...
Andrew Solovay [Tue, 26 May 2015 21:09:51 +0000 (21:09 +0000)]
am f5c2de6f: am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit 'f5c2de6f52c4b1e88e3e63f6a59e487139b61047':
  docs: M Runtime Permissions overview.

9 years agoam 8673f0c4: Merge "Don\'t leak starting window when app crashes before adding window...
Wale Ogunwale [Tue, 26 May 2015 21:09:45 +0000 (21:09 +0000)]
am 8673f0c4: Merge "Don\'t leak starting window when app crashes before adding windows" into mnc-dev

* commit '8673f0c4b70b0890c2026e676fa6cb379cff2414':
  Don't leak starting window when app crashes before adding windows

9 years agoam 707368b5: Merge "Add vvm type for t-mobile." into mnc-dev
Nancy Chen [Tue, 26 May 2015 21:09:41 +0000 (21:09 +0000)]
am 707368b5: Merge "Add vvm type for t-mobile." into mnc-dev

* commit '707368b583dbc16ae65fdd91a5dd34f377aa29fa':
  Add vvm type for t-mobile.

9 years agoam d1e0b949: Merge "Add fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 21:09:36 +0000 (21:09 +0000)]
am d1e0b949: Merge "Add fingerprint icon" into mnc-dev

* commit 'd1e0b9493acc377c4d2638e103a80692d07e6936':
  Add fingerprint icon

9 years agoam 326ee191: am 4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 21:06:14 +0000 (21:06 +0000)]
am 326ee191: am 4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev

* commit '326ee191e2700023b10ae18b8a3dc8be4e0b3c76':
  Polish animations for fingerprint icon
  MediaPlayer: add mPreparing to weed out unwanted prepared messages
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  For getHomeActivity() only return current user.
  Fix application moves.
  Close race condition in binderDied()
  Write packages.list when adding/removing users.
  camera: Add AIDL interface for CameraServiceProxy.
  Fix NPE in setSurfaceTexure
  Deal more gracefully with null smallIcons.
  Don't crash in bugreport on devices without BT
  Push initial disk state, handle empty media.

9 years agoam a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works...
Nicolas Prevot [Tue, 26 May 2015 21:06:09 +0000 (21:06 +0000)]
am a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

* commit 'a4aab96e2099a47a76cd8b684d06838a8d744c3e':
  Say in the doc that DISALLOW_CONFIG_VPN now works.

9 years agoam f0d37251: am cf3c8af6: am 125dbf89: am d313958f: Merge "docs: Add API Overview...
Quddus Chong [Tue, 26 May 2015 21:06:05 +0000 (21:06 +0000)]
am f0d37251: am cf3c8af6: am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit 'f0d37251a78bda74a50d09fb0ce8006e3d687a44':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoam 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc...
Andrew Solovay [Tue, 26 May 2015 20:57:17 +0000 (20:57 +0000)]
am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit '28942bbe21f188ac7da502454337ceea7c6323a9':
  docs: M Runtime Permissions overview.

9 years agoMerge "Don't leak starting window when app crashes before adding windows" into mnc-dev
Wale Ogunwale [Tue, 26 May 2015 20:56:46 +0000 (20:56 +0000)]
Merge "Don't leak starting window when app crashes before adding windows" into mnc-dev

9 years agoMerge "Add vvm type for t-mobile." into mnc-dev
Nancy Chen [Tue, 26 May 2015 20:54:26 +0000 (20:54 +0000)]
Merge "Add vvm type for t-mobile." into mnc-dev

9 years agoam 4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:51:43 +0000 (20:51 +0000)]
am 4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev

* commit '4e792fa5a9b8de20503011dcffce92f96435d53c':
  Polish animations for fingerprint icon
  MediaPlayer: add mPreparing to weed out unwanted prepared messages
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  For getHomeActivity() only return current user.
  Fix application moves.
  Close race condition in binderDied()
  Write packages.list when adding/removing users.
  camera: Add AIDL interface for CameraServiceProxy.
  Fix NPE in setSurfaceTexure
  Deal more gracefully with null smallIcons.
  Don't crash in bugreport on devices without BT
  Push initial disk state, handle empty media.

9 years agoam 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
Nicolas Prevot [Tue, 26 May 2015 20:51:38 +0000 (20:51 +0000)]
am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

* commit '5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
  Say in the doc that DISALLOW_CONFIG_VPN now works.

9 years agoam cf3c8af6: am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior...
Quddus Chong [Tue, 26 May 2015 20:51:34 +0000 (20:51 +0000)]
am cf3c8af6: am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit 'cf3c8af6c5dbdd7c0c7c019fe10ca21c9c2369cc':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoMerge "Add fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:50:46 +0000 (20:50 +0000)]
Merge "Add fingerprint icon" into mnc-dev

9 years agoAdd fingerprint icon
Jorim Jaggi [Wed, 20 May 2015 02:47:11 +0000 (19:47 -0700)]
Add fingerprint icon

Bug: 20663748
Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8

9 years agoMerge "Polish animations for fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:48:38 +0000 (20:48 +0000)]
Merge "Polish animations for fingerprint icon" into mnc-dev

9 years agoam a2abf79f: am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performa...
Joe Fernandez [Tue, 26 May 2015 20:46:23 +0000 (20:46 +0000)]
am a2abf79f: am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit 'a2abf79f6ea462ef154af9150e81595614840d61':
  docs: M Preview - Performance Testing

9 years agoam 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
Andrew Solovay [Tue, 26 May 2015 20:44:00 +0000 (20:44 +0000)]
am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit '99f4bdf5ff90fe17512d4a77142f254a489bccc2':
  docs: M Runtime Permissions overview.

9 years agoMerge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
Nicolas Prevot [Tue, 26 May 2015 20:39:27 +0000 (20:39 +0000)]
Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

9 years agoam 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs...
Quddus Chong [Tue, 26 May 2015 20:37:00 +0000 (20:37 +0000)]
am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit '125dbf895db097cd83cbeedc81571060f3f40099':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoPolish animations for fingerprint icon
Jorim Jaggi [Wed, 20 May 2015 21:13:23 +0000 (14:13 -0700)]
Polish animations for fingerprint icon

- Make error state animation faster.
- Add animation for
-- Draw on when turning on the screen
-- Draw off when unlocking
-- Error state -> normal state

Bug: 21269675
Change-Id: If09c0a35ce194fbeeb86151d45b4cfa81c9999c5

9 years agoMerge "docs: M Runtime Permissions overview." into mnc-preview-docs
Andrew Solovay [Tue, 26 May 2015 20:30:41 +0000 (20:30 +0000)]
Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

9 years agoam 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing...
Joe Fernandez [Tue, 26 May 2015 20:30:26 +0000 (20:30 +0000)]
am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit '5fa7b8bd8cbf6407ab88bdf5f3e3a6e40053b98c':
  docs: M Preview - Performance Testing

9 years agoam d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer...
Quddus Chong [Tue, 26 May 2015 20:23:22 +0000 (20:23 +0000)]
am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit 'd313958f8ed099b90bbd3580580f4e37e9bf3c81':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoam ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc...
Joe Fernandez [Tue, 26 May 2015 20:22:00 +0000 (20:22 +0000)]
am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit 'ec5aa0e183011d0243219f760250b917d7a24c63':
  docs: M Preview - Performance Testing

9 years agoam cbff23cb: am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing...
Joe Fernandez [Tue, 26 May 2015 20:15:54 +0000 (20:15 +0000)]
am cbff23cb: am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit 'cbff23cb04115aaafb0362797255d2f6b7133071':
  docs: M Preview Testing Guide

9 years agoam 1897f104: am a04c7d40: Merge "media: Update MediaCodec class description" into...
Lajos Molnar [Tue, 26 May 2015 20:15:49 +0000 (20:15 +0000)]
am 1897f104: am a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev

* commit '1897f104f18bfb2736e9960381ad5f1f704bcf95':
  media: Update MediaCodec class description

9 years agoMerge "docs: Add API Overview and Behavior Changes docs for M Developer Preview....
Quddus Chong [Tue, 26 May 2015 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

9 years agodocs: Add API Overview and Behavior Changes docs for M Developer Preview.
Quddus Chong [Sun, 10 May 2015 23:07:27 +0000 (16:07 -0700)]
docs: Add API Overview and Behavior Changes docs for M Developer Preview.

Change-Id: I4aff933b60b7eac17ccfa4f5f41f26153d464418

9 years agoam 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:08:42 +0000 (20:08 +0000)]
am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit '71574a995b9ac66673970b99f12a94cf84901418':
  docs: M Preview - Performance Testing

9 years agoam 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into...
Joe Fernandez [Tue, 26 May 2015 20:01:50 +0000 (20:01 +0000)]
am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit '96e97b5563773c37f4e43ef6121851ce8beb794a':
  docs: M Preview Testing Guide

9 years agoam a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Tue, 26 May 2015 20:01:45 +0000 (20:01 +0000)]
am a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev

* commit 'a04c7d400c7b9d39b56cec3d705eea39a767370e':
  media: Update MediaCodec class description

9 years agoam b8f3b76a: am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar...
John Spurlock [Tue, 26 May 2015 20:01:44 +0000 (20:01 +0000)]
am b8f3b76a: am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

* commit 'b8f3b76a50b32886608d1ad13171a8cf508fcd4d':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.

9 years agoMerge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:00:56 +0000 (20:00 +0000)]
Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

9 years agodocs: M Preview - Performance Testing
Joe Fernandez [Sat, 23 May 2015 06:53:28 +0000 (23:53 -0700)]
docs: M Preview - Performance Testing

Change-Id: I6b23d83a198528353f60749e07d40a00c051866d

9 years agoam 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview...
Joe Fernandez [Tue, 26 May 2015 19:58:04 +0000 (19:58 +0000)]
am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit '37f827db9b3a66f7f4f455011d42c84e610416d6':
  docs: M Preview Testing Guide

9 years agodocs: M Runtime Permissions overview.
Andrew Solovay [Wed, 13 May 2015 01:01:13 +0000 (18:01 -0700)]
docs: M Runtime Permissions overview.

Based on the Google Doc which has gone through tech review. See
first comment for doc stage location.

NOTE: Because the M Preview reference docs are not going to be live on
DAC (they'll be downloadable in a zip archive, I believe), we can't
put in live hyperlinks to new-for-M classes/fields/ methods. Those
have to just be in <code> font with no link. This is consistent across
all the preview docs, and will of course change when these docs are
converted for the MNC release.

bug: 21411602
bug: 21411604

Change-Id: I1163abc1dc884cf27b0e94d266f3979f131db2ab

9 years agoMerge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Tue, 26 May 2015 19:52:01 +0000 (19:52 +0000)]
Merge "media: Update MediaCodec class description" into mnc-dev

9 years agomedia: Update MediaCodec class description
Lajos Molnar [Fri, 22 May 2015 16:35:58 +0000 (09:35 -0700)]
media: Update MediaCodec class description

Bug: 11990465
Bug: 11019199
Bug: 11990564
Bug: 10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995

9 years agoam 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile...
John Spurlock [Tue, 26 May 2015 19:50:07 +0000 (19:50 +0000)]
am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

* commit '12e0b390efd2fb8c21a2700be9dcd95d15b31ba6':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.

9 years agoMerge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

9 years agoam c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:41:48 +0000 (19:41 +0000)]
am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit 'c3d171bbe1c55445ff475c63203b4a8eae5e40c7':
  docs: M Preview Testing Guide

9 years agoZen: Calendar auto-rule tracks primary calendar for corp profile.
John Spurlock [Wed, 20 May 2015 13:47:13 +0000 (09:47 -0400)]
Zen: Calendar auto-rule tracks primary calendar for corp profile.

 - Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c

9 years agoMerge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:26:40 +0000 (19:26 +0000)]
Merge "docs: M Preview Testing Guide" into mnc-preview-docs

9 years agoam a149acfd: am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into...
Jason Monk [Tue, 26 May 2015 19:26:07 +0000 (19:26 +0000)]
am a149acfd: am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev

* commit 'a149acfd0b04102ed78de28d8677dd404bd01690':
  Switch runtime permission icons to vectors

9 years agoam 30b39ca5: am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioForm...
Jean-Michel Trivi [Tue, 26 May 2015 19:26:02 +0000 (19:26 +0000)]
am 30b39ca5: am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

* commit '30b39ca5bc38fae5ada222366a90dbcefdc29004':
  Remove temporary javadoc for android.media.AudioFormat

9 years agodocs: M Preview Testing Guide
Joe Fernandez [Thu, 21 May 2015 23:31:13 +0000 (16:31 -0700)]
docs: M Preview Testing Guide

A general overview for developers on what to test during the  M Preview

Change-Id: Idbc080482afdaf08c665e4ff2b7e62a84f9b398a

9 years agoam c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:10:25 +0000 (19:10 +0000)]
am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev

* commit 'c2ddb3e452d4d3a360ad697bf89a786f2af7a377':
  Switch runtime permission icons to vectors

9 years agoam 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into...
Jean-Michel Trivi [Tue, 26 May 2015 19:10:21 +0000 (19:10 +0000)]
am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

* commit '5c37f1ee57d85185eb36c6f961722f2d39022447':
  Remove temporary javadoc for android.media.AudioFormat

9 years agoMerge "Switch runtime permission icons to vectors" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:04:27 +0000 (19:04 +0000)]
Merge "Switch runtime permission icons to vectors" into mnc-dev

9 years agoMerge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 19:01:19 +0000 (19:01 +0000)]
Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

9 years agoam b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:52:01 +0000 (18:52 +0000)]
am b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev

* commit 'b301b64ae9e1db4e4bc39f4cfd97dbaeaafeec51':
  Support icons in the FloatingToolbar

9 years agoRemove temporary javadoc for android.media.AudioFormat
Jean-Michel Trivi [Tue, 26 May 2015 18:50:11 +0000 (11:50 -0700)]
Remove temporary javadoc for android.media.AudioFormat

Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d

9 years agoam da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:39:24 +0000 (18:39 +0000)]
am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev

* commit 'da1b398173a94e94c61a0d186c7dc0ef2a7bd060':
  Support icons in the FloatingToolbar

9 years agoSwitch runtime permission icons to vectors
Jason Monk [Tue, 26 May 2015 18:33:53 +0000 (14:33 -0400)]
Switch runtime permission icons to vectors

Bug: 21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb

9 years agoMerge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:26:36 +0000 (18:26 +0000)]
Merge "Support icons in the FloatingToolbar" into mnc-dev

9 years agoam a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 18:19:21 +0000 (18:19 +0000)]
am a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

* commit 'a9c7f95b2a5fb19f8ee475e31691455333c19d41':
  Remove KeyStoreParameter.getContext().

9 years agoam 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 18:04:40 +0000 (18:04 +0000)]
am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

* commit '7bf011ab924f465c7a779f4e42fdd4f9d7c6a09a':
  Remove KeyStoreParameter.getContext().

9 years agoam 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager...
Paul Jensen [Tue, 26 May 2015 18:02:14 +0000 (18:02 +0000)]
am 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

* commit '8164d4c3c601eb341bafb25cf05a069d7029bfed':
  Add javadoc comments mentioning ConnectivityManager API permissions.

9 years agoam a859b09f: am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNe...
Paul Jensen [Tue, 26 May 2015 18:02:09 +0000 (18:02 +0000)]
am a859b09f: am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

* commit 'a859b09f80ba77213cb339fd3267843102dbd4ac':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

9 years agoMerge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 17:57:53 +0000 (17:57 +0000)]
Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

9 years agoam 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissio...
Paul Jensen [Tue, 26 May 2015 17:45:36 +0000 (17:45 +0000)]
am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

* commit '46ed04de082b18137d879161802fd8512a70e9d4':
  Add javadoc comments mentioning ConnectivityManager API permissions.

9 years agoam 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest...
Paul Jensen [Tue, 26 May 2015 17:45:32 +0000 (17:45 +0000)]
am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

* commit '7891fcb52a8e0295e3f1d29f534376fd8cbc8d46':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

9 years agoRemove KeyStoreParameter.getContext().
Alex Klyubin [Tue, 26 May 2015 17:40:15 +0000 (10:40 -0700)]
Remove KeyStoreParameter.getContext().

This method isn't there in the released API and we don't need it in
the new API.

Bug: 18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9

9 years agoam 50b30be2: am 75a857ce: Merge "Handle error states when refreshing accessibility...
Alan Viverette [Tue, 26 May 2015 17:40:12 +0000 (17:40 +0000)]
am 50b30be2: am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev

* commit '50b30be28bfb8bdf36835efe10e92f84b85b9b0e':
  Handle error states when refreshing accessibility node

9 years agoam e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonificat...
Jean-Michel Trivi [Tue, 26 May 2015 17:40:07 +0000 (17:40 +0000)]
am e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

* commit 'e95b750bb353bec7f7cbc370a6c883828f7319c9':
  Ringtone picker is not affected by current sonification policy

9 years agoam d4be3a7c: am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library...
Rich Slogar [Tue, 26 May 2015 17:40:03 +0000 (17:40 +0000)]
am d4be3a7c: am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit 'd4be3a7c76585bc42d7f5971eacea71ea5f5d4b5':
  docs: support library 22.2 updates

9 years agoam 1a042b55: am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg...
Jason Monk [Tue, 26 May 2015 17:39:59 +0000 (17:39 +0000)]
am 1a042b55: am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

* commit '1a042b5585a5441273abc6f45138628dea37ae99':
  SysUI: Move LocationControllerImpl receiver to bg

9 years agoam e4d0f67e: am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:39:54 +0000 (17:39 +0000)]
am e4d0f67e: am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev

* commit 'e4d0f67e5f3fa4812ab28d1ad5c7c88e5f28aefc':
  Unflip TextureView getBitmap readback

9 years agoam a2a8eca8: am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:39:48 +0000 (17:39 +0000)]
am a2a8eca8: am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev

* commit 'a2a8eca8ddcf2f155363f4d4c41748a0c6eea0f3':
  Clarify example for Deep Share

9 years agoMerge "Add javadoc comments mentioning ConnectivityManager API permissions." into...
Paul Jensen [Tue, 26 May 2015 17:37:32 +0000 (17:37 +0000)]
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

9 years agoMerge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent...
Paul Jensen [Tue, 26 May 2015 17:33:24 +0000 (17:33 +0000)]
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

9 years agoam 75a857ce: Merge "Handle error states when refreshing accessibility node" into...
Alan Viverette [Tue, 26 May 2015 17:32:54 +0000 (17:32 +0000)]
am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev

* commit '75a857cec5f3500954a76f251e81535378ba293a':
  Handle error states when refreshing accessibility node

9 years agoam dfe318d7: Merge "Ringtone picker is not affected by current sonification policy...
Jean-Michel Trivi [Tue, 26 May 2015 17:32:49 +0000 (17:32 +0000)]
am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

* commit 'dfe318d7120b8a1299dda957ad84d29171b583fb':
  Ringtone picker is not affected by current sonification policy

9 years agoam 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates...
Rich Slogar [Tue, 26 May 2015 17:32:43 +0000 (17:32 +0000)]
am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit '7ae3520e6fb996d00e90f6cdc55cddff66f3b617':
  docs: support library 22.2 updates

9 years agoMerge "Handle error states when refreshing accessibility node" into mnc-dev
Alan Viverette [Tue, 26 May 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Handle error states when refreshing accessibility node" into mnc-dev

9 years agoMerge "Ringtone picker is not affected by current sonification policy" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 17:27:06 +0000 (17:27 +0000)]
Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

9 years agoam 72faacb7: am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:26:15 +0000 (17:26 +0000)]
am 72faacb7: am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev

* commit '72faacb70997ed50edabc33f45d65228e18fbea9':
  QS: Only show summary for active wifi

9 years agoam 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:26:09 +0000 (17:26 +0000)]
am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

* commit '7cd8a7e1bdb0019e52c1eaff7c1c6b17ba0e4719':
  SysUI: Move LocationControllerImpl receiver to bg

9 years agoam 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:26:05 +0000 (17:26 +0000)]
am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev

* commit '87d8bb3d85416c28545f94feb1db77875ebe9cf2':
  Unflip TextureView getBitmap readback

9 years agoam 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:26:00 +0000 (17:26 +0000)]
am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev

* commit '1ddc95ebb244660244681558d16325771ca56b3c':
  Clarify example for Deep Share

9 years agoam 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview...
Rich Slogar [Tue, 26 May 2015 17:23:48 +0000 (17:23 +0000)]
am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit '59e5d7189911fc86a65624a337a75d8f840cff3d':
  docs: support library 22.2 updates

9 years agoMerge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:19:09 +0000 (17:19 +0000)]
Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

9 years agoMerge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev

9 years agoMerge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev

9 years agoam 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:13:05 +0000 (17:13 +0000)]
am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev

* commit '80370952e9008ba3949d6e9bc3412e62a05e1ba3':
  QS: Only show summary for active wifi

9 years agoSysUI: Move LocationControllerImpl receiver to bg
Jason Monk [Tue, 19 May 2015 18:21:28 +0000 (14:21 -0400)]
SysUI: Move LocationControllerImpl receiver to bg

Bug: 19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757

9 years agoam a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 17:07:42 +0000 (17:07 +0000)]
am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit 'a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
  docs: support library 22.2 updates

9 years agoMerge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev

9 years agoMerge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 16:58:41 +0000 (16:58 +0000)]
Merge "docs: support library 22.2 updates" into mnc-preview-docs

9 years agoQS: Only show summary for active wifi
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi

Bug: 20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17

9 years agoam b0e12ac7: am 16224288: Merge "Add constants for permissions granted status api...
Jason Monk [Tue, 26 May 2015 16:53:35 +0000 (16:53 +0000)]
am b0e12ac7: am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev

* commit 'b0e12ac758e4770635cf13d97e97c37b7f5ec812':
  Add constants for permissions granted status api

9 years agoam 477c746e: am 327c3641: Merge "Cancel voice assist session on user switch" into...
James Cook [Tue, 26 May 2015 16:42:06 +0000 (16:42 +0000)]
am 477c746e: am 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev

* commit '477c746ecca05c83af66060d4b4321ee5976ced1':
  Cancel voice assist session on user switch

9 years agoam 16224288: Merge "Add constants for permissions granted status api" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:41:46 +0000 (16:41 +0000)]
am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev

* commit '16224288791dd3f122931504e624637fdcc70903':
  Add constants for permissions granted status api

9 years agoMerge "Add constants for permissions granted status api" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev

9 years agoam 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev
James Cook [Tue, 26 May 2015 16:29:42 +0000 (16:29 +0000)]
am 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev

* commit '327c364113c18c9d5a05df0c912b65788461da41':
  Cancel voice assist session on user switch