197338 Commits

Author SHA1 Message Date
Jeff Sharkey
e2de54a17d am 819bf267: am 1bf1af04: am d659f450: Fix the build months later?
* commit '819bf2675518585b529943603d46df1d4e50e6b1':
  Fix the build months later?
2015-06-01 17:25:34 +00:00
Joe Fernandez
b222593c59 am 28c48192: am 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '28c48192b37fd8e4bfc1e89a96526b4f75b7a964':
  docs: M Preview - Update volantis download signatures
2015-06-01 17:25:28 +00:00
Alan Viverette
5cd74c1b80 am c5d46246: am 143c97b2: am 2b184e86: Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
* commit 'c5d46246c6006e8d60ba037b553181569e480a41':
  Reduce amount of unnecessary RippleDrawable mask redraw
2015-06-01 17:25:21 +00:00
Andrew Solovay
bd7ae86b50 am ee7c2fc9: am 3d4db82c: am 765389ec: am c5abcba4: am 820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit 'ee7c2fc92c9f5f4738d4e06a0f02df0143c38128':
  docs: Quick fixes for the M Preview "Setup SDK" page.
2015-06-01 17:25:16 +00:00
David Friedman
fd40614b13 am ba790168: am b5b6633a: am 538aabc1: am 270d4a70: am acb470be: am 490f8761: am 7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit 'ba790168eb7739e82d317355efdc6ca1a72f84d5':
  Quick typo fix.
2015-06-01 17:25:09 +00:00
Deepanshu Gupta
444521d90f am 0603b30e: am 829159f1: am 996458b7: Fix ParserFactory not initialized error.
* commit '0603b30e17dbdee1d6b6fd0faabd8272a909ec08':
  Fix ParserFactory not initialized error.
2015-06-01 17:25:04 +00:00
Joe Fernandez
5a75ee0c30 am 9d24d2ea: am 159f6ccd: am e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
* commit '9d24d2ea182edfb314311949b2dd58e2fc388ddc':
  docs: supportlib 22.2.0 design version update
2015-06-01 17:24:57 +00:00
Yohei Yukawa
38f59f80a6 am 64f5d4f0: am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit '64f5d4f0311d9ac61a432d4a37948c55ae42bc2c':
  Close input session when the view is detached from the window.
2015-06-01 17:24:47 +00:00
Christopher Tate
ebee48fc57 am 9b564b91: am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling
* commit '9b564b913234021d87df26f104b7617e62503377':
  Adjust key/value backup scheduling
2015-06-01 17:24:40 +00:00
Jeff Brown
4363875b8f am 19d50b8f: am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit '19d50b8f796df8e547b6c72662ab6086971b480e':
  Tell PhoneWindowManager when we start/finish interactive changes.
2015-06-01 17:24:27 +00:00
Doris Liu
80ba46a585 am 82b45589: am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit '82b455892c6a7f228cf444f6cd949f0edeade113':
  Fix calls to Rect.intersect() in package android.view
2015-06-01 17:24:20 +00:00
Dirk Dougherty
32a20f8ba2 am bc0cb7c7: am e89fe7a3: am 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust permissions language.
* commit 'bc0cb7c7fb2df54be5d87a9084bb299ee1a7f5df':
  Fix a date, adjust permissions language.
2015-06-01 17:24:13 +00:00
Alan Viverette
9e1c664fab am e2fa70ea: am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
* commit 'e2fa70eaea00ad07c39a2ce472c2df42db1c6b1c':
  Replace PNG-based seekbar thumb animation with AVD
2015-06-01 17:24:06 +00:00
Geoff Mendal
378b74fbe0 Merge "Import translations. DO NOT MERGE" 2015-06-01 17:16:49 +00:00
Jeff Sharkey
819bf26755 am 1bf1af04: am d659f450: Fix the build months later?
* commit '1bf1af0492459ff77cd6b901329eb13f3507bb1e':
  Fix the build months later?
2015-06-01 17:08:43 +00:00
Joe Fernandez
28c48192b3 am 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '7045b392780d12ff051e53a98cbf76b35b24df39':
  docs: M Preview - Update volantis download signatures
2015-06-01 17:08:33 +00:00
Alan Viverette
c5d46246c6 am 143c97b2: am 2b184e86: Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
* commit '143c97b2f07b6176b1a2ec624b76ce133b2c0c28':
  Reduce amount of unnecessary RippleDrawable mask redraw
2015-06-01 17:08:23 +00:00
Andrew Solovay
ee7c2fc92c am 3d4db82c: am 765389ec: am c5abcba4: am 820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '3d4db82c563c4c1f90ff18ec5cdd37b17feec8dd':
  docs: Quick fixes for the M Preview "Setup SDK" page.
2015-06-01 17:08:16 +00:00
David Friedman
ba790168eb am b5b6633a: am 538aabc1: am 270d4a70: am acb470be: am 490f8761: am 7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit 'b5b6633ad97dc9f0bddc0b0442b084965ddc882b':
  Quick typo fix.
2015-06-01 17:08:10 +00:00
Deepanshu Gupta
0603b30e17 am 829159f1: am 996458b7: Fix ParserFactory not initialized error.
* commit '829159f109f6f3ce38205f10d707c5565a32e889':
  Fix ParserFactory not initialized error.
2015-06-01 17:08:02 +00:00
Joe Fernandez
9d24d2ea18 am 159f6ccd: am e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
* commit '159f6ccda1ffbfc6cb55abc6f09bf96aa9dd1cbf':
  docs: supportlib 22.2.0 design version update
2015-06-01 17:07:56 +00:00
Yohei Yukawa
64f5d4f031 am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit 'd9597642ebbe4601568ad73ff20281c237e606fa':
  Close input session when the view is detached from the window.
2015-06-01 17:07:48 +00:00
Christopher Tate
9b564b9132 am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling
* commit 'd323f6cfaf1b905235930f32871fd4d0919a56c5':
  Adjust key/value backup scheduling
2015-06-01 17:07:42 +00:00
Jeff Brown
19d50b8f79 am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit '82f7affa196d9efbca7f47fdb6ce96b498172829':
  Tell PhoneWindowManager when we start/finish interactive changes.
2015-06-01 17:07:34 +00:00
Doris Liu
82b455892c am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit 'dab830615ebb6c4dc31fc52b05143a950142f7fe':
  Fix calls to Rect.intersect() in package android.view
2015-06-01 17:07:29 +00:00
Dirk Dougherty
bc0cb7c7fb am e89fe7a3: am 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust permissions language.
* commit 'e89fe7a308392db8d8533e94afddfb369a7bdb4e':
  Fix a date, adjust permissions language.
2015-06-01 17:07:23 +00:00
Alan Viverette
e2fa70eaea am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
* commit '8dbdd860e57618a5738b5c39758fc5feb75ef58f':
  Replace PNG-based seekbar thumb animation with AVD
2015-06-01 17:02:24 +00:00
Geoff Mendal
9014d993f5 Import translations. DO NOT MERGE
Change-Id: I1b4387cd9c47aaaa2399d203fbd547a9c07f466f
Auto-generated-cl: translation import
2015-06-01 09:24:50 -07:00
Adrian Roos
747ffe3109 am 26ee3f2b: am ddc4886f: am b85e1ecf: Fix broken transition to secure apps when relaunching
* commit '26ee3f2bb0300ed6e5f3c0b22f8cdeb6186372e4':
  Fix broken transition to secure apps when relaunching
2015-06-01 16:16:06 +00:00
Marco Nelissen
60b432f792 am 8a76cd6d: am 59984c79: am 2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
* commit '8a76cd6d6d9b442aeef3a3251cb3a8d6c4408592':
  Update ExifInterface.getDateTime to support subseconds
2015-06-01 16:16:01 +00:00
ztenghui
71123f8766 am f302eb00: am 856846f1: am e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
* commit 'f302eb00524e89971c181df3cac595b29575c2c5':
  Tweak the threshold for conic path quads computation.
2015-06-01 16:15:56 +00:00
Joe Fernandez
b359bdf101 am 1b1930f1: am eadb33b6: am 8c176dd2: am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
* commit '1b1930f184328fa6c61b906e518779f78d6f0fa7':
  docs: Regen wearable docs with new redesign templates
2015-06-01 16:15:50 +00:00
Andrew Solovay
126b339986 am 6afc36d0: am 5075ee2a: am 9074831a: am def1dde3: am 1521c51c: docs: Quick fixes to screenshot
* commit '6afc36d0224659ef111f6f7f5a852b25bdee9480':
  docs: Quick fixes to screenshot
2015-06-01 16:15:44 +00:00
Olawale Ogunwale
b4d4f1458e am a2576459: am e1f58785: (-s ours) am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit 'a25764595c088c68cf8f90eabcf3066d874925f8':
  Should reset mDismissKeyguard on keyguard secure change
2015-06-01 16:15:39 +00:00
Adrian Roos
26ee3f2bb0 am ddc4886f: am b85e1ecf: Fix broken transition to secure apps when relaunching
* commit 'ddc4886f9e7ad77d99e8b649a43593e92270d609':
  Fix broken transition to secure apps when relaunching
2015-06-01 16:04:27 +00:00
Marco Nelissen
8a76cd6d6d am 59984c79: am 2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
* commit '59984c795dd2c93a557f25e60fb124b28fd2da19':
  Update ExifInterface.getDateTime to support subseconds
2015-06-01 16:04:22 +00:00
ztenghui
f302eb0052 am 856846f1: am e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
* commit '856846f15a533828d33f1b515a71b059f1ee9a7e':
  Tweak the threshold for conic path quads computation.
2015-06-01 16:04:05 +00:00
Joe Fernandez
1b1930f184 am eadb33b6: am 8c176dd2: am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
* commit 'eadb33b629aaa21ca888ffcf12b21d800038400a':
  docs: Regen wearable docs with new redesign templates
2015-06-01 16:04:00 +00:00
Andrew Solovay
6afc36d022 am 5075ee2a: am 9074831a: am def1dde3: am 1521c51c: docs: Quick fixes to screenshot
* commit '5075ee2aa6df48d3827a09ec2671bc57c73e3eab':
  docs: Quick fixes to screenshot
2015-06-01 16:03:47 +00:00
Olawale Ogunwale
a25764595c am e1f58785: (-s ours) am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit 'e1f587859a2e41e309a93d2de604753bdbb14dca':
  Should reset mDismissKeyguard on keyguard secure change
2015-06-01 16:02:38 +00:00
Olawale Ogunwale
37938cfcc1 am 995846a4: am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '995846a4310ef4270177bf9d6c6673827b5625af':
  Fix null pointer dereference when security exception occurs
2015-06-01 15:48:14 +00:00
Olawale Ogunwale
3ec7b82bba am 185a3d7d: am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '185a3d7d3566348a191a448d3aff1ec6c2b97033':
  WindowManagerService not propagating X and Y steps
2015-06-01 15:48:08 +00:00
Chris Wren
b74836329c am bb5ef426: am 8517a793: am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
* commit 'bb5ef42654b5a1dd768ece4a002ba0bbb941e7c6':
  add time-in-mode metrics for zen mode
2015-06-01 15:48:02 +00:00
Adrian Roos
c2b1bf18cb am a3cd7dda: am 4adc3b00: am e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
* commit 'a3cd7dda9763c56f9ebdaa79700c8ed246a5ca75':
  Hide KeyguardMessageArea if empty
2015-06-01 15:47:56 +00:00
destradaa
b1190c779f am 36cb20bc: am aff14c59: am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
* commit '36cb20bc547e2d762f8ee51398143b0ab4cc0b59':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
2015-06-01 15:47:50 +00:00
Yohei Yukawa
a6c4c80cc7 am 1d95daf3: am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '1d95daf37dd492ae3f7c1ea0a35114ae32dcaecf':
  Revert "Rely on IMM#focusOut() to close input session."
2015-06-01 15:47:43 +00:00
Doris Liu
626e3fa160 am 0040c7d2: am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit '0040c7d2bab147d4ea88aa7d0299bd51420b799f':
  Update doc to include how clipToPadding affects EdgeEffect
2015-06-01 15:47:38 +00:00
Svetoslav
b12280202d am d5464b9d: am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
* commit 'd5464b9d07f6d5cf39d8173d5a026ce457dc458f':
  Use AtomicFile APIs correctly when reading.
2015-06-01 15:47:32 +00:00
Alex Klyubin
df748ed7ca am c623d988: am db57c48e: am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
* commit 'c623d9887be68d9c647dd40dc55743bb61b791ab':
  Cleanup Binder token resetting.
2015-06-01 15:47:24 +00:00
John Spurlock
94d78b6bf0 am 7eac7b5a: am 68a00c52: am 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
* commit '7eac7b5af10da68cb11737a3f7fcdc2012cda87f':
  Zen: Dim status bar alarm icon when zen = total silence.
2015-06-01 15:47:19 +00:00