Chet Haase
081ddbe296
Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
2015-06-30 22:46:44 +00:00
David Friedman
f53b05d046
Docs: Fixes metadata that was getting mangled in jd_lists_unified file.
...
This fixes a regression introduced in the CL for bug 21789313.
Change-Id: Ic7829d9a33356261c562c814f0873bb352f0655b
2015-06-30 15:46:29 -07:00
Alan Viverette
5906f58771
Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
2015-06-30 22:45:07 +00:00
Vinit Deshpande
7226c8f95b
More API review feedback
...
ScanResult now hides all flags and their values, only methods
are public; and converted roaming consortium to an array of longs
instead of Longs.
Bug: 22179306
Change-Id: I644110dbddd5fa7a7109ac16051845fcc4c4e9d1
2015-06-30 15:44:00 -07:00
Rich Slogar
8371632b16
docs: Studio 1.3 new install and feature sections
...
Change-Id: I1bf6d1fa60b01b404a01cc3b5f45753a764d6f31
2015-06-30 15:43:54 -07:00
Deepanshu Gupta
c428b55c97
Merge "Replace infinite loop with foreach." into mnc-dev
2015-06-30 22:42:00 +00:00
Deepanshu Gupta
f5ca45baab
Merge "Add missing resolveResValue call." into mnc-dev
2015-06-30 22:41:44 +00:00
Deepanshu Gupta
c77f9c76e4
Replace infinite loop with foreach.
...
A method call exists to find all inner classes. Use it instead of
manually enumerating the possibilities and checking.
Also fix a typo.
Change-Id: I2af678e92ea0c11b53617b247d8cda324391c185
2015-06-30 15:36:34 -07:00
Chris Craik
2aa56c5428
Clearer message when failing to draw a SW layer
...
bug:21376603
Change-Id: I7433491c16c5bc95cffc8e35aac07eb551be9c8e
2015-06-30 15:33:44 -07:00
Chet Haase
1b7f8f99c3
Invalidate parent when scrolling child view back onto screen
...
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.
Issue #21413554 offsetTopAndBottom requires invalidating parent when view becomes visible again
Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
2015-06-30 15:33:30 -07:00
Rich Slogar
48413e6a11
am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs
...
* commit '761b4a7deb2438e039fdb11a05e2de41593ffd8f':
docs: migration guide link update
2015-06-30 22:31:52 +00:00
Jorim Jaggi
6ef5898793
Don't show orb when voice session is already running
...
Bug: 22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
2015-06-30 22:30:34 +00:00
Jorim Jaggi
3b866bee86
Make sure endClosing doesn't get called too early
...
Bug: 22196478
Bug: 22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
2015-06-30 22:30:08 +00:00
Alan Viverette
aa69922ace
Use non-greedy view to draw background in landscape time picker
...
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
2015-06-30 15:29:13 -07:00
Barnaby James
371a2385b4
Minor doc fixes for VoiceInteractor.
...
Minor documentation fixes.
Make some @deprecated APIs @hidden.
Change-Id: I6bb3b6ab3a2518899098ac9f920386eeef12f635
2015-06-30 15:22:49 -07:00
Rich Slogar
761b4a7deb
Merge "docs: migration guide link update" into mnc-preview-docs
2015-06-30 22:21:18 +00:00
Filip Gruszczynski
3ce79f6c0c
am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
...
* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
Build fix after changing IWindowSession.
2015-06-30 22:17:55 +00:00
Filip Gruszczynski
2987f616fa
resolved conflicts for merge of 300ccf4a to mnc-dev
...
Change-Id: Ia315e314bfde0c066a2c25d93f8cbdc71fee0a14
2015-06-30 15:03:30 -07:00
Filip Gruszczynski
96496e2d17
Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
2015-06-30 22:02:34 +00:00
Luan Nguyen
a4ac253bc3
am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
...
* commit 'ed053477d0f76edad4853f0a5aac275acfe2d6ce':
docs: Move scale Bitmap code to onSurfaceChanged
2015-06-30 22:02:23 +00:00
Adam Lesinski
f4216d30cd
Add helper function to extract app ID from shared app gid.
...
Bug:22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
2015-06-30 15:00:22 -07:00
Amit Mahajan
45e50f87bb
am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '71699d760eff662055dde458ea0d614a32fb6dfc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:55:08 +00:00
Joe Fernandez
f1f720b607
am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit 'cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:55:01 +00:00
Luan Nguyen
ed053477d0
Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
2015-06-30 21:53:29 +00:00
Svet Ganov
1aaad610df
Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev
2015-06-30 21:44:34 +00:00
Doris Liu
e08f3b3ff5
Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev
2015-06-30 21:42:43 +00:00
Filip Gruszczynski
7e3b61e73d
Build fix after changing IWindowSession.
...
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
2015-06-30 14:42:21 -07:00
Amit Mahajan
71699d760e
am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:40:32 +00:00
Joe Fernandez
cbbbabaa4a
am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:40:27 +00:00
Doris Liu
99aa13ec10
Merge "Allow null child view when checking whether divider should draw" into mnc-dev
2015-06-30 21:35:09 +00:00
Deepanshu Gupta
5d1eaf4a19
Add missing resolveResValue call.
...
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
2015-06-30 14:28:58 -07:00
Amit Mahajan
95c47354a6
am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '43d3bd027604f400caf49826e5b4705784937b35':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:23:41 +00:00
Joe Fernandez
4c8ecd9a70
am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '72356f0b20d4e6d84430629c2bb7d8baac55002d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:23:34 +00:00
Rich Slogar
e3d8df6307
am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs
...
* commit '3de121f94c1ee4624e263aede6e2f7af7231b968':
docs: studio workflow page typo
2015-06-30 21:22:50 +00:00
Chris Craik
ca985b54c8
Merge "Don't display layout bounds of GONE views" into mnc-dev
2015-06-30 21:22:26 +00:00
Robert Schaub
9caf6bf98b
docs: Added warning to not use Android Key when API key is required
...
Bug: 19937308
Staged at: http://rschaub.mtv.corp.google.com:9000/training/safetynet/index.html
Change-Id: Icb763858bb7ababdad7631a58a31f3a26571e65d
2015-06-30 14:22:07 -07:00
Amith Yamasani
462ac3a2aa
Don't allow non-admins to adopt sd card for internal storage
...
Bug: 21883016
Change-Id: I9af3eeffd860b076e69bb02a3dc06edba5f95898
2015-06-30 14:21:01 -07:00
Luan Nguyen
6cfe6a8d38
docs: Move scale Bitmap code to onSurfaceChanged
...
bug: 21099578
Change-Id: I5e8d1c6c1757ec512ff2695689bc5b8c2c88706f
2015-06-30 14:13:14 -07:00
Doris Liu
f102d4266b
Allow null child view when checking whether divider should draw
...
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.
Bug: 22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
2015-06-30 13:57:28 -07:00
Alan Viverette
b35e866713
Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
2015-06-30 20:53:31 +00:00
Chris Craik
a763bb83cf
Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
2015-06-30 20:52:26 +00:00
Chris Craik
a1dab8bb0f
Don't display layout bounds of GONE views
...
bug:22126532
Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
2015-06-30 13:51:26 -07:00
Alex Klyubin
89575b678c
Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
2015-06-30 20:48:19 +00:00
Rich Slogar
3de121f94c
Merge "docs: studio workflow page typo" into mnc-preview-docs
2015-06-30 20:38:25 +00:00
Alan Viverette
6ef129e09d
Handle null argument in ImageView.setImageIcon()
...
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.
Bug: 21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
2015-06-30 13:32:27 -07:00
Rich Slogar
a351bca51a
docs: migration guide link update
...
b.android/178474
Change-Id: Ie0c54b1eb4d47426da4e09cfea0ede7dde3c7a91
2015-06-30 13:31:47 -07:00
Adam Lesinski
40fab055bb
Merge "Add round/notround qualifier to docs" into mnc-dev
2015-06-30 20:31:26 +00:00
Adam Lesinski
32ddd53466
Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
2015-06-30 20:30:46 +00:00
Robert Schaub
e51d6d05e9
am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
...
* commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7':
docs: Changed link in Java source code comment to repair 404
2015-06-30 20:26:36 +00:00
Chris Craik
de25a672b1
Saturate alpha values when overlaying glyphs
...
bug:19062769
Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.
Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
2015-06-30 13:24:18 -07:00