168130 Commits

Author SHA1 Message Date
Winson Chung
c990660771 am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev
automerge: 741a5b5

* commit '741a5b5a0264ecc445c4c56f6c42c921d76d3dde':
  Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)
2014-11-14 21:39:20 +00:00
Fyodor Kupolov
70b2de7c25 am 6dd9f86f: Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev
automerge: a07bdda

* commit 'a07bdda0d4d859467f8c435161d00d2340f34e9d':
  Added synchronization to handlePackagesChanged method
2014-11-14 21:36:35 +00:00
Ye Wen
fc40ecd0e6 am 8b69c28b: Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev
automerge: 58635a5

* commit '58635a571d89120e313015e1c09926fda17689f5':
  Delay connecting to MmsService until APIs are called for imms
2014-11-14 21:34:42 +00:00
Winson Chung
741a5b5a02 am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev
* commit '189457c931bbc5fe5c9bbf61050dca7db3d45194':
  Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)
2014-11-14 19:06:19 +00:00
Fyodor Kupolov
a07bdda0d4 am 6dd9f86f: Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev
* commit '6dd9f86f10deda42ea5374f83d2a189c3a72d68f':
  Added synchronization to handlePackagesChanged method
2014-11-14 19:06:14 +00:00
Ye Wen
58635a571d am 8b69c28b: Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev
* commit '8b69c28b7d446c35e4d644ce4935a31bac228e00':
  Delay connecting to MmsService until APIs are called for imms
2014-11-14 19:06:07 +00:00
Miao Wang
345efc1e5c am 34c495d2: Merge "Add Float32 suppor for IntrinsicResize. base part."
* commit '34c495d2e9d873aeb7e3d86077f0ef4b8d8993b6':
  Add Float32 suppor for IntrinsicResize. base part.
2014-11-14 18:13:49 +00:00
Miao Wang
34c495d2e9 Merge "Add Float32 suppor for IntrinsicResize. base part." 2014-11-14 18:02:13 +00:00
Winson Chung
189457c931 Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev 2014-11-14 17:32:30 +00:00
Fyodor Kupolov
6dd9f86f10 Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev 2014-11-14 17:26:07 +00:00
Ye Wen
8b69c28b7d Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev 2014-11-14 17:22:12 +00:00
Craig Mautner
6888315979 am d21db6b6: am 135ae6dc: am 33d92c56: Use package name as custom resolver process name
* commit 'd21db6b6c4d2d470af2824ad8cd908317a1e71be':
  Use package name as custom resolver process name
2014-11-14 16:43:15 +00:00
Craig Mautner
d21db6b6c4 am 135ae6dc: am 33d92c56: Use package name as custom resolver process name
* commit '135ae6dc3b667595b4bf2c681e1db95dc657b88f':
  Use package name as custom resolver process name
2014-11-14 16:38:27 +00:00
Craig Mautner
135ae6dc3b am 33d92c56: Use package name as custom resolver process name
* commit '33d92c56781f6058c9e682737a06c41f3a2d2f3a':
  Use package name as custom resolver process name
2014-11-14 16:31:20 +00:00
Craig Mautner
33d92c5678 Use package name as custom resolver process name
The process name was being assigned null. This meant that after the
process attached we weren't matching the name in
ActivityStackSupervisor.attachApplicationLocked(). That meant missing
the call to realStartActivityLocked() and then the resolver didn't
start until window manager timed out and resumeTopActivity was
called five seconds later.

Fixes bug 18301267.

Change-Id: If3721caeebb309c6054150b2f707e3d6e38a74d2
2014-11-14 15:09:54 +00:00
Jason Monk
b44a0df7a4 am 59ea2612: am 53e52e52: Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev
* commit '59ea2612d41d735ae7a6fb9cb485e1405224336e':
  SysUI: Add basic test coverage for signal levels
2014-11-14 14:59:43 +00:00
Jason Monk
59ea2612d4 am 53e52e52: Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev
* commit '53e52e52112adf342bbfbc089b397dea1b27b074':
  SysUI: Add basic test coverage for signal levels
2014-11-14 14:55:01 +00:00
Jason Monk
53e52e5211 Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev 2014-11-14 14:50:05 +00:00
Esteban Talavera
fb70be1d1f am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users.
* commit '95162ad2eaa45cf2643b564c7fd03bfe0e4844de':
  New AccountManager method to copy accounts between users.
2014-11-14 11:42:48 +00:00
Esteban Talavera
95162ad2ea am 22dc3b7b: New AccountManager method to copy accounts between users.
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
  New AccountManager method to copy accounts between users.
2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1 New AccountManager method to copy accounts between users.
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.

Also an extra in the public api to identify the account to migrate
during provisioning.

Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
2014-11-14 11:09:27 +00:00
Sander Alewijnse
75f79bc08b am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
* commit '7bec28c5a1e1c0787542930ed291f5aadfee6e75':
  Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:38:44 +00:00
Sander Alewijnse
7bec28c5a1 am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
  Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06 Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 2014-11-14 10:26:38 +00:00
Mark Renouf
9987386729 am 7b6cadd4: am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit '7b6cadd4045a1d33b4b376b84f0fc1d14f48566b':
  Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 02:29:52 +00:00
Mark Renouf
7b6cadd404 am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit '437d02d389711487a29662455b52a601053d9749':
  Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 02:24:11 +00:00
Mark Renouf
437d02d389 am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit 'cd22c3d67c98a6ac98291c3337e6506546e771be':
  Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 02:14:29 +00:00
Alan Viverette
b757edc036 am c51e7ed0: am 42b25914: Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev
* commit 'c51e7ed07dca0bfa2609730c9a78b25f2c6c2b65':
  Ignore accessibility overlays during visible window computation
2014-11-14 02:06:59 +00:00
Alan Viverette
5961f6b767 am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev
* commit 'a9566f9085427287e99b0b20c51dda4688a3e1e8':
  Set current degrees when updating RotateDrawable from typed array
2014-11-14 02:06:53 +00:00
Mark Renouf
cd22c3d67c Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev 2014-11-14 02:04:31 +00:00
Alan Viverette
c51e7ed07d am 42b25914: Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev
* commit '42b25914477daa00b3adf7c3d8f89b4614b08b49':
  Ignore accessibility overlays during visible window computation
2014-11-14 01:57:30 +00:00
Alan Viverette
a9566f9085 am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev
* commit '0c242376867feb434088387bfcdc6b4abcf7d465':
  Set current degrees when updating RotateDrawable from typed array
2014-11-14 01:57:23 +00:00
Alan Viverette
db3aa6be93 am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
* commit '04bea0905724e24ce8b80187134e7f698607ae1a':
  Account for window bounds in accessibility view click point computation
2014-11-14 01:56:50 +00:00
Alan Viverette
42b2591447 Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev 2014-11-14 01:52:25 +00:00
Alan Viverette
0c24237686 Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev 2014-11-14 01:52:14 +00:00
Alan Viverette
04bea09057 am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
  Account for window bounds in accessibility view click point computation
2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2 Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 2014-11-14 01:46:01 +00:00
Sarah Maddox
4a3dc665f7 am baec01af: am 2f8d4ea2: am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit 'baec01af4bc604b1c9a93297d11b0efa2029f569':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
2014-11-14 00:32:49 +00:00
Sarah Maddox
baec01af4b am 2f8d4ea2: am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '2f8d4ea2064940b373c96b47d6fcdefad3732ee8':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
2014-11-14 00:27:54 +00:00
Sarah Maddox
2f8d4ea206 am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit 'f21e7d31582b404e479d9a594f192e67e2b95d8f':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
2014-11-14 00:21:14 +00:00
Mark Renouf
de7187b956 Sets windowOverscan for all Wear DeviceDefault themes.
Without this flag, window insets will be consumed by the first View
which does not explicitly override onApplyWindowInsets. This is either
SwipeDismissLayout or the content view of the activity (if swipeDismiss
is not enabled).

BUG: 18376451
Change-Id: I5e590bad9810a9a232a6c318f715d587a3290f34
2014-11-13 19:12:55 -05:00
Sarah Maddox
f21e7d3158 am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit 'aa3a93ede76b46ef6ca0daa18ca9a6cd77c26f66':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
2014-11-14 00:09:12 +00:00
Andreas Gampe
e64565e0a5 Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 2014-11-14 00:09:02 +00:00
Andreas Gampe
f4e341d99c Frameworks/base: Mask pdfium warning
Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
2014-11-13 16:07:13 -08:00
Chris Craik
bbac83fc79 am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev
* commit 'c3784c4d6140517a6927685f552fa8719353e46f':
  Add offset method to Outline
2014-11-14 00:03:33 +00:00
Alan Viverette
8f5de8c6c0 am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 00:03:27 +00:00
Alan Viverette
57f77e44c1 am d200288a: am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev
* commit 'd200288a8b703d200859682baa3d6ff7afabd175':
  Make indeterminate progress alpha consistent with determinate
2014-11-14 00:03:22 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
2014-11-14 00:03:16 +00:00
Nick Kralevich
188b609946 am e66c031d: am c9754740: Merge "fix crash on invalid base64 key" into lmp-mr1-dev
* commit 'e66c031da48b52b8d03e59476d24dfdfdfd94551':
  fix crash on invalid base64 key
2014-11-14 00:03:10 +00:00
kmccormick
5b5c83d797 am 99453e57: am 12780933: am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '99453e5742f38ca06bcd0e0c61236105432bfe10':
  Doc update: new reg error code + snippet
2014-11-14 00:03:03 +00:00