OSDN Git Service

android-x86/frameworks-base.git
9 years agoam fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into...
Raph Levien [Mon, 1 Jun 2015 22:10:07 +0000 (22:10 +0000)]
am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

* commit 'fb2cdc4ca131ff95179414854eca02a098a29a8a':
  Revert "Revert "Use getRunAdvance to position cursor""

9 years agoam e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:10:02 +0000 (22:10 +0000)]
am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit 'e0e5c1cf1965302fcf177eaade372313504ea53a':
  Clean up AbsListView constructor

9 years agoam eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native...
Robert Shih [Mon, 1 Jun 2015 22:09:57 +0000 (22:09 +0000)]
am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

* commit 'eb8a51f359e4e1f4187eb14fa5e584979d26768b':
  MediaPlayer: trigger onError instead of exception on stale native notifications

9 years agoMerge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

9 years agoMerge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 21:56:34 +0000 (21:56 +0000)]
Merge "Clean up AbsListView constructor" into mnc-dev

9 years agoMerge "MediaPlayer: trigger onError instead of exception on stale native notification...
Robert Shih [Mon, 1 Jun 2015 21:55:49 +0000 (21:55 +0000)]
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

9 years agoam bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Abodunrinwa Toki [Mon, 1 Jun 2015 21:42:27 +0000 (21:42 +0000)]
am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev

* commit 'bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5':
  Fix FloatingToolbar look and animation for RTL.

9 years agoam 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 21:42:22 +0000 (21:42 +0000)]
am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev

* commit '14438d122c1e7ab88a6169bca13a35d50e76e91e':
  Camera2: Add tangential distortion coefficients

9 years agoam 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 21:42:08 +0000 (21:42 +0000)]
am 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev

* commit '9d28852f6108b20266de0282f4bf858e679316b7':
  Remove separate light/dark animated vector drawables

9 years agoam 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 21:41:40 +0000 (21:41 +0000)]
am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev

* commit '8c1e287bf801d98cbaa6df904524625c3935fdd0':
  Fix RenderScript copy tracing sections

9 years agoRevert "Revert "Use getRunAdvance to position cursor""
Raph Levien [Mon, 1 Jun 2015 21:34:47 +0000 (14:34 -0700)]
Revert "Revert "Use getRunAdvance to position cursor""

This reverts commit 5730c974800a0ffed59a041d9e249a5c42e417db.

9 years agoMerge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Abodunrinwa Toki [Mon, 1 Jun 2015 21:31:19 +0000 (21:31 +0000)]
Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev

9 years agoMerge "Camera2: Add tangential distortion coefficients" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 21:26:01 +0000 (21:26 +0000)]
Merge "Camera2: Add tangential distortion coefficients" into mnc-dev

9 years agoMerge "Remove separate light/dark animated vector drawables" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Remove separate light/dark animated vector drawables" into mnc-dev

9 years agoMerge "Fix RenderScript copy tracing sections" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Fix RenderScript copy tracing sections" into mnc-dev

9 years agoMediaPlayer: trigger onError instead of exception on stale native notifications
Robert Shih [Thu, 28 May 2015 01:11:44 +0000 (18:11 -0700)]
MediaPlayer: trigger onError instead of exception on stale native notifications

This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".

Bug: 21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d

9 years agoRemove separate light/dark animated vector drawables
Andrew Flynn [Mon, 1 Jun 2015 20:34:21 +0000 (16:34 -0400)]
Remove separate light/dark animated vector drawables

Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.

Bug: 21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6

9 years agoam 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into...
Chris Tate [Mon, 1 Jun 2015 20:20:54 +0000 (20:20 +0000)]
am 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

* commit '88fb14532421f049614c34120c706c26a9af6bbd':
  DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.

9 years agoam b0db15c6: Merge "Next alarm clock updates." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:13:03 +0000 (20:13 +0000)]
am b0db15c6: Merge "Next alarm clock updates." into mnc-dev

* commit 'b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
  Next alarm clock updates.

9 years agoam 78b16987: Merge "Change colors of AVD test" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 20:12:53 +0000 (20:12 +0000)]
am 78b16987: Merge "Change colors of AVD test" into mnc-dev

* commit '78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
  Change colors of AVD test

9 years agoMerge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing...
Chris Tate [Mon, 1 Jun 2015 20:11:56 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

9 years agoMerge "Next alarm clock updates." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:07:38 +0000 (20:07 +0000)]
Merge "Next alarm clock updates." into mnc-dev

9 years agoMerge "Change colors of AVD test" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 20:04:06 +0000 (20:04 +0000)]
Merge "Change colors of AVD test" into mnc-dev

9 years agoam cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:55:12 +0000 (19:55 +0000)]
am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev

* commit 'cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
  Revert "Use getRunAdvance to position cursor"

9 years agoam 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:55:08 +0000 (19:55 +0000)]
am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev

* commit '061e2bbf6bdbcccd71844248be953081f2b5fe70':
  Be more careful with mAccessPoints usage

9 years agoMerge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:45:24 +0000 (19:45 +0000)]
Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev

9 years agoMerge "Be more careful with mAccessPoints usage" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Be more careful with mAccessPoints usage" into mnc-dev

9 years agoRevert "Use getRunAdvance to position cursor"
Raph Levien [Mon, 1 Jun 2015 19:40:42 +0000 (12:40 -0700)]
Revert "Use getRunAdvance to position cursor"

This reverts commit cb5499c85097450c48f66f6c08a35bab2ad5ab12.

Bug: 21549197

9 years agoam 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
Jorim Jaggi [Mon, 1 Jun 2015 19:18:29 +0000 (19:18 +0000)]
am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev

* commit '1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
  Cleanup Keyguard handling when turning off screen

9 years agoam 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on...
Filip Gruszczynski [Mon, 1 Jun 2015 19:18:25 +0000 (19:18 +0000)]
am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.

* commit '29c840ebb08d97451fd5a5923ad20d7bf1990048':
  Dismiss or cancel in SwipeDismissLayout on screen off.

9 years agoam 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute...
Wale Ogunwale [Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)]
am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

* commit '4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
  Allow app to stop lockTaskMode if started by manifest attribute

9 years agoMerge "Cleanup Keyguard handling when turning off screen" into mnc-dev
Jorim Jaggi [Mon, 1 Jun 2015 19:13:10 +0000 (19:13 +0000)]
Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev

9 years agoam 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
Filip Gruszczynski [Mon, 1 Jun 2015 19:09:57 +0000 (19:09 +0000)]
am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.

* commit '11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
  Dismiss or cancel in SwipeDismissLayout on screen off.

9 years agoMerge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

9 years agoBe more careful with mAccessPoints usage
Jason Monk [Mon, 1 Jun 2015 19:00:57 +0000 (15:00 -0400)]
Be more careful with mAccessPoints usage

Bug: 21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1

9 years agoam 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
Filip Gruszczynski [Mon, 1 Jun 2015 18:57:21 +0000 (18:57 +0000)]
am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.

* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.

9 years agoAllow app to stop lockTaskMode if started by manifest attribute
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute

It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.

Bug: 21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2

9 years agoam 6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am 6920474b: Merge "Ensuring that we write to disk first." into mnc-dev

* commit '6920474bac7c212dd384b6ef1134c59b73669942':
  Ensuring that we write to disk first.

9 years agoam a74f385b: Allow long-pressing task icon to show app-info.
Winson Chung [Mon, 1 Jun 2015 18:23:37 +0000 (18:23 +0000)]
am a74f385b: Allow long-pressing task icon to show app-info.

* commit 'a74f385ba08922c09aa812f0d6fd2903a633da01':
  Allow long-pressing task icon to show app-info.

9 years agoMerge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev

9 years agoEnsuring that we write to disk first.
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.

Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2

9 years agoAllow long-pressing task icon to show app-info.
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.

Bug: 17369696

9 years agoam 064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
Yorke Lee [Mon, 1 Jun 2015 18:05:15 +0000 (18:05 +0000)]
am 064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev

* commit '064fc83b81e215881c2ad22827741e6e9142f948':
  Add ability to modify default dialer via ADB

9 years agoam 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into...
Alan Viverette [Mon, 1 Jun 2015 18:05:09 +0000 (18:05 +0000)]
am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

* commit '0ee2c1aef93987663968dbfd693cc5eda06c8244':
  Prevent crash when ColorStateList has unresolved attrs

9 years agoam 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 18:05:05 +0000 (18:05 +0000)]
am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

* commit '254ed616712866518225dbc156182f39339e76a4':
  Camera2: Add missing LEGACY available keys

9 years agoam 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 18:05:00 +0000 (18:05 +0000)]
am 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev

* commit '0de6dea6fb0c3b87e967c4c223f5edda359d1c8c':
  No need to specify key size when importing.

9 years agoam 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader,...
Andres Morales [Mon, 1 Jun 2015 18:04:56 +0000 (18:04 +0000)]
am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

* commit '0fddb1a63109e2d4a92327ea1ffc74307292be48':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

9 years agoam 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 18:04:48 +0000 (18:04 +0000)]
am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

* commit '61bae6d8de096c8982074ac507554fda42a802a5':
  Camera2: update docs for reprocess timestamp

9 years agoMerge "Add ability to modify default dialer via ADB" into mnc-dev
Yorke Lee [Mon, 1 Jun 2015 18:00:49 +0000 (18:00 +0000)]
Merge "Add ability to modify default dialer via ADB" into mnc-dev

9 years agoMerge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

9 years agoFix RenderScript copy tracing sections
Chris Craik [Mon, 1 Jun 2015 17:39:36 +0000 (10:39 -0700)]
Fix RenderScript copy tracing sections

bug:21560057

Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186

9 years agoMerge "Camera2: Add missing LEGACY available keys" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 17:53:40 +0000 (17:53 +0000)]
Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

9 years agoMerge "No need to specify key size when importing." into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 17:53:28 +0000 (17:53 +0000)]
Merge "No need to specify key size when importing." into mnc-dev

9 years agoMerge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery...
Andres Morales [Mon, 1 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

9 years agoMerge "Camera2: update docs for reprocess timestamp" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 17:50:54 +0000 (17:50 +0000)]
Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

9 years agoRevert "[partition checking] re-enable bootimage/bootloader, add recovery"
Andres Morales [Mon, 1 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

This reverts commit 831e01a89e9636baf15d35e7f8ff5e9f290c8b87.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a

9 years agoPrevent crash when ColorStateList has unresolved attrs
Alan Viverette [Mon, 1 Jun 2015 17:45:49 +0000 (10:45 -0700)]
Prevent crash when ColorStateList has unresolved attrs

Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a

9 years agoClean up AbsListView constructor
Alan Viverette [Mon, 1 Jun 2015 17:47:29 +0000 (10:47 -0700)]
Clean up AbsListView constructor

Change-Id: I5ebe0074849228e5c7fd629df6d1055c867debc8

9 years agoCamera2: Add missing LEGACY available keys
Yin-Chia Yeh [Thu, 28 May 2015 22:58:22 +0000 (15:58 -0700)]
Camera2: Add missing LEGACY available keys

Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1

9 years agoam 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into...
Alan Viverette [Mon, 1 Jun 2015 17:44:03 +0000 (17:44 +0000)]
am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

* commit '9be801c8269358ded8e4bed6103ca2346da7e179':
  Don't ignore explicit dividerHeight of 0 specified in XML

9 years agoMerge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 17:33:15 +0000 (17:33 +0000)]
Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

9 years agoDon't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 17:30:21 +0000 (10:30 -0700)]
Don't ignore explicit dividerHeight of 0 specified in XML

Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15

9 years agoDismiss or cancel in SwipeDismissLayout on screen off.
Filip Gruszczynski [Mon, 1 Jun 2015 17:09:45 +0000 (10:09 -0700)]
Dismiss or cancel in SwipeDismissLayout on screen off.

Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a

9 years agoNo need to specify key size when importing.
Alex Klyubin [Mon, 1 Jun 2015 16:52:16 +0000 (09:52 -0700)]
No need to specify key size when importing.

The underlying Keymaster implementation no longer requires that.

Bug: 19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749

9 years agoam 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into...
Alan Viverette [Mon, 1 Jun 2015 16:44:03 +0000 (16:44 +0000)]
am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

* commit '242b9c4eee9d42d02fd2259ffe2124234653aaf2':
  Fix row/column order when unparcelling CollectionItemInfo

9 years agoam e3e314df: Network Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 1 Jun 2015 16:43:58 +0000 (16:43 +0000)]
am e3e314df: Network Reset should have a lockdown like Factory Reset.

* commit 'e3e314df4d52881225326d426a76e3e7f1bc40d3':
  Network Reset should have a lockdown like Factory Reset.

9 years agoMerge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

9 years agoFix FloatingToolbar look and animation for RTL.
Abodunrinwa Toki [Mon, 1 Jun 2015 16:35:34 +0000 (17:35 +0100)]
Fix FloatingToolbar look and animation for RTL.

- Fix positioning issues which causes the toolbar to appear cut
since it extends beyond its containing window.
- Fix the open/close overflow animations to open to left (instead
  or right) for RTL.

Bug: 21455067
Change-Id: I799b74c67c96b03bca4b2c9fbb6e1165b651ac7f

9 years agoam 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015...
Joe Fernandez [Mon, 1 Jun 2015 16:33:21 +0000 (16:33 +0000)]
am 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '540d0e0d834da68bfd6377dd35ed29ed1765d106':
  docs: Android Dashboard - June 2015 update

9 years agoam 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:33:17 +0000 (16:33 +0000)]
am 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev

* commit '48fe2631373931d8ab4a403791dd09394519acf6':
  Only use outsets for full screen windows.

9 years agoNext alarm clock updates.
John Spurlock [Mon, 1 Jun 2015 16:27:22 +0000 (12:27 -0400)]
Next alarm clock updates.

 - Add explicit user setup signal to status bar icon policy.
 - Include per-user next alarm clock info in service dump.

Bug: 21551365
Change-Id: Ib16636522bbe04d205a377567007145f146e9d39

9 years agoNetwork Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 20 Apr 2015 21:07:45 +0000 (14:07 -0700)]
Network Reset should have a lockdown like Factory Reset.

bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)

9 years agoam 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into...
Joe Fernandez [Mon, 1 Jun 2015 16:26:12 +0000 (16:26 +0000)]
am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
  docs: Android Dashboard - June 2015 update

9 years agoam 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:24:25 +0000 (16:24 +0000)]
am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

* commit '3aa33b3da04774d76e1a65b749667450dc81532b':
  Update button to BUTTON_STYLUS_PRIMARY

9 years agoam ef24bc00: Merge "Update stylus button press recognition in View to use new MotionE...
Mady Mellor [Mon, 1 Jun 2015 16:24:21 +0000 (16:24 +0000)]
am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev

* commit 'ef24bc00399ceb627e9780f05eb68f955e6bd495':
  Update stylus button press recognition in View to use new MotionEvent APIs

9 years agoam cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to...
Mady Mellor [Mon, 1 Jun 2015 16:24:16 +0000 (16:24 +0000)]
am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev

* commit 'cac7b2b17505dd3d84966ff15abf5e5343783dee':
  Update stylus button press recognition in GestureDetector to use new APIs

9 years agoresolved conflicts for merge of a61e23f1 to mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:23:14 +0000 (09:23 -0700)]
resolved conflicts for merge of a61e23f1 to mnc-dev

Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc

9 years agoMerge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:17:36 +0000 (16:17 +0000)]
Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

9 years agoMerge "Update stylus button press recognition in View to use new MotionEvent APIs...
Mady Mellor [Mon, 1 Jun 2015 16:16:16 +0000 (16:16 +0000)]
Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev

9 years agoMerge "Update stylus button press recognition in GestureDetector to use new APIs...
Mady Mellor [Mon, 1 Jun 2015 16:15:52 +0000 (16:15 +0000)]
Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev

9 years agoam 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:12:35 +0000 (16:12 +0000)]
am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev

* commit '8825de1751b4362d3a6fce2e402c51e481bb2729':
  Revert "Revert "Fix build.""

9 years agoam b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to...
smain@google.com [Mon, 1 Jun 2015 16:12:32 +0000 (16:12 +0000)]
am b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

* commit 'b305410962eba135605c87ed246b2d7051d4e86a':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

9 years agoMerge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:47 +0000 (16:07 +0000)]
Merge "Revert "Revert "Fix build.""" into mnc-dev

9 years agoRevert "Revert "Fix build.""
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:36 +0000 (16:07 +0000)]
Revert "Revert "Fix build.""

This reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.

Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e

9 years agoam 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview...
Joe Fernandez [Mon, 1 Jun 2015 16:06:26 +0000 (16:06 +0000)]
am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
  docs: Android Dashboard - June 2015 update

9 years agoFix row/column order when unparcelling CollectionItemInfo
Alan Viverette [Mon, 1 Jun 2015 16:03:27 +0000 (09:03 -0700)]
Fix row/column order when unparcelling CollectionItemInfo

Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c

9 years agoam 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search...
smain@google.com [Mon, 1 Jun 2015 16:01:30 +0000 (16:01 +0000)]
am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

* commit '67725e2aa47596207ebffc00e3737c609536fe93':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

9 years agoam 35a803be: Only use outsets for full screen windows.
Filip Gruszczynski [Mon, 1 Jun 2015 16:01:16 +0000 (16:01 +0000)]
am 35a803be: Only use outsets for full screen windows.

* commit '35a803beec9ce508fd53ab7e4111f2f9f87296c1':
  Only use outsets for full screen windows.

9 years agoMerge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
Joe Fernandez [Mon, 1 Jun 2015 15:52:31 +0000 (15:52 +0000)]
Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

9 years agoam 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc...
Filip Gruszczynski [Mon, 1 Jun 2015 15:52:05 +0000 (15:52 +0000)]
am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

9 years agodocs: Android Dashboard - June 2015 update
Joe Fernandez [Mon, 1 Jun 2015 15:47:19 +0000 (08:47 -0700)]
docs: Android Dashboard - June 2015 update

Change-Id: I81709ea7f4d5ac0abfbd2834c98c4e05b4904878

9 years agoam 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistaken...
smain@google.com [Mon, 1 Jun 2015 15:42:57 +0000 (15:42 +0000)]
am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

* commit '7f6da0c3cbb9b38d345f7c575d1069d2a85099e5':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

9 years agoMerge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into...
Filip Gruszczynski [Mon, 1 Jun 2015 15:42:40 +0000 (15:42 +0000)]
Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

9 years agoam c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:35:02 +0000 (15:35 +0000)]
am c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoOnly use outsets for full screen windows.
Filip Gruszczynski [Wed, 27 May 2015 22:38:29 +0000 (15:38 -0700)]
Only use outsets for full screen windows.

Change-Id: I1d89c314b0f9944dfa417ce066c397073d51466e

9 years agoam e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:34:58 +0000 (15:34 +0000)]
am e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into...
John Spurlock [Mon, 1 Jun 2015 15:34:53 +0000 (15:34 +0000)]
am a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev

* commit 'a58b9a2c06e6b0143a28cc3bf86d3f003c69b559':
  Battery saver: limit notification intents to system UI.

9 years agoam 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
Selim Cinek [Mon, 1 Jun 2015 15:34:48 +0000 (15:34 +0000)]
am 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev

* commit '4bd071e590ad5917ae81e71ad6b1d0807d8893cb':
  Shortened the duration of HUNs

9 years agoadd back the GMS and GCM reference lists to fix search suggest.
smain@google.com [Mon, 1 Jun 2015 15:21:07 +0000 (08:21 -0700)]
add back the GMS and GCM reference lists to fix search suggest.
mistakenly removed during:
https://googleplex-android-review.git.corp.google.com/#/c/697534/1

Change-Id: I804364d98d5dea6110bb309603c80df84c66a19d

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:19:48 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev