Miao Wang
27faad5bd0
am 345efc1e: am 34c495d2: Merge "Add Float32 suppor for IntrinsicResize. base part."
...
* commit '345efc1e5c36863ee41856caa6ac058c975f8d9e':
Add Float32 suppor for IntrinsicResize. base part.
2014-11-14 19:32:04 +00:00
Craig Mautner
a8a8822aa7
am 68883159: am d21db6b6: am 135ae6dc: am 33d92c56: Use package name as custom resolver process name
...
* commit '688831597953d68b2da3304b61686d9ea6410c00':
Use package name as custom resolver process name
2014-11-14 19:30:51 +00:00
Jason Monk
024c023c3f
am b44a0df7: am 59ea2612: am 53e52e52: Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev
...
* commit 'b44a0df7a4ca86b976ddf01b0cbbfce6662fd6bd':
SysUI: Add basic test coverage for signal levels
2014-11-14 19:20:02 +00:00
Esteban Talavera
cdf1bd3da4
am fb70be1d: am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users.
...
* commit 'fb70be1d1fbe659578dd0dd3c32e01da12ac5b08':
New AccountManager method to copy accounts between users.
2014-11-14 19:19:52 +00:00
Sander Alewijnse
25e9dbc4cf
am 75f79bc0: am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
...
* commit '75f79bc08b5d8c2cfe999f1dfd0d1d880c58ff93':
Add extra to enable device admins to skip removal of system apps.
2014-11-14 19:19:36 +00:00
Mark Renouf
5cf8a655bb
am 99873867: am 7b6cadd4: am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
...
* commit '99873867293b226d3a5670e6143f2383306f55e9':
Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 19:18:51 +00:00
Alan Viverette
2fec0de51a
am b757edc0: am c51e7ed0: am 42b25914: Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev
...
* commit 'b757edc0362aae3351e81c480de766b732ffddf8':
Ignore accessibility overlays during visible window computation
2014-11-14 19:18:44 +00:00
Alan Viverette
a208f546d5
am 5961f6b7: am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev
...
* commit '5961f6b767a3e549654c6bfdae2960144b4ca428':
Set current degrees when updating RotateDrawable from typed array
2014-11-14 19:18:39 +00:00
Alan Viverette
b7fbcefcec
am db3aa6be: am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
...
* commit 'db3aa6be933b732c57e7e124f40388b0695a3638':
Account for window bounds in accessibility view click point computation
2014-11-14 19:18:32 +00:00
Sarah Maddox
c55976f08c
am 4a3dc665: 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 '4a3dc665f721054c5a7a857a65301f534a6843e9':
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 19:18:09 +00:00
Andreas Gampe
6d6f049008
am e64565e0: Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp
...
* commit 'e64565e0a503397f0d59fed0e6aaef23807782b4':
Frameworks/base: Mask pdfium warning
2014-11-14 19:17:54 +00:00
Chris Craik
a76634b855
am bbac83fc: am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev
...
* commit 'bbac83fc7987b67e6116b4422aee47580aae128a':
Add offset method to Outline
2014-11-14 19:17:14 +00:00
Alan Viverette
3cad91aa5c
am 8f5de8c6: am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '8f5de8c6c0d5da3c81670b72d5b412acea502d22':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 19:17:09 +00:00
Alan Viverette
6ab29c3bba
am 57f77e44: am d200288a: am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev
...
* commit '57f77e44c18c9ac0b074b377eb9e74a94ef3ab2f':
Make indeterminate progress alpha consistent with determinate
2014-11-14 19:17:04 +00:00
ztenghui
2f96e233de
am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
...
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
Fix the starting pen's position when a path close.
2014-11-14 19:17:00 +00:00
Nick Kralevich
076f0d5d0b
am 188b6099: am e66c031d: am c9754740: Merge "fix crash on invalid base64 key" into lmp-mr1-dev
...
* commit '188b609946c629e61c606b72dd423f9171953a0e':
fix crash on invalid base64 key
2014-11-14 19:16:55 +00:00
kmccormick
c45b0d5e0f
am 5b5c83d7: am 99453e57: am 12780933: am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit '5b5c83d797de287c25e499dac6c801bde4a4bb0b':
Doc update: new reg error code + snippet
2014-11-14 19:16:50 +00:00
Jeff Sharkey
afc506c54b
am 670cf5c6: am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
...
* commit '670cf5c663f4f17faafa9d4f7cf7209f68a02468':
Move ringtone redirection to MediaPlayer.
2014-11-14 19:16:38 +00:00
Abhijith Shastry
e3435feed4
am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
...
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
new sms/mms carrier app API
2014-11-14 19:16:33 +00:00
Andreas Gampe
18fddfe020
am c25e0dce: am 5b50cd13: Merge "Frameworks/base: Fix build"
...
* commit 'c25e0dcea982468225c4150dcb699db5185a1eee':
Frameworks/base: Fix build
2014-11-14 19:15:59 +00:00
Andreas Gampe
2e4ad0a641
am d99c25ef: am 37079e29: Merge "Frameworks/base: Wall Werror in packages"
...
* commit 'd99c25eff3ad421b900caf7af82f970b23a81733':
Frameworks/base: Wall Werror in packages
2014-11-14 19:15:52 +00:00
Andreas Gampe
ed5d5fb434
am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"
...
* commit '035a7b0235835e856f39623fc571668e2d6048da':
Frameworks/base: Wall Werror in core/jni
2014-11-14 19:15:42 +00:00
Geoff Mendal
62d9f4086a
am aba61dc1: (-s ours) am 85e5c196: (-s ours) am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'aba61dc19d6f1566ba153746cabd63e689735418':
Import translations. DO NOT MERGE
2014-11-14 18:56:35 +00:00
Jeff Brown
cfeb06165b
am 5e94e19c: am c69191c1: am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
...
* commit '5e94e19c1fe0a4379348b392d5f2cbc52b304bb5':
Remove an unnecessary condition from previous change.
2014-11-14 18:56:30 +00:00
Jeff Brown
34bf3e8b40
am 36ed887f: am 3415634c: am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '36ed887fa3f9cc7274299a7289d2cbf071f41436':
Improve screen brightness boost behavior.
2014-11-14 18:56:25 +00:00
Renato Mangini
43b6008558
am 70955365: am 46112fe1: am 7e582533: am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit '70955365b7ac66dca0eaa47e3636ca87fa138137':
Add new samples to what's new page.
2014-11-14 18:56:20 +00:00
John Spurlock
72ea52cb74
am eba075e5: am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev automerge: 1a68ba6
...
* commit 'eba075e5db77966f942c2fb504be7543c69b1f19':
Zen: Update condition text for current condition.
2014-11-14 18:55:17 +00:00
Jeff Sharkey
a6d094754c
am 1eac0a01: am 51151dcc: Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev automerge: 3f8b53c
...
* commit '1eac0a0105ac2e7468b7f2f58993a94cd3e44bae':
Make package verifier broadcasts foreground.
2014-11-14 18:55:12 +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
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