Kevin Hufnagle
b5f0030c36
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev
...
am: 0402936230
2016-08-08 23:57:44 +00:00
Kevin Hufnagle
3ded4c5774
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
...
am: 70f8ca8dff
2016-08-08 23:57:42 +00:00
Kevin Hufnagle
7c2d0c77a6
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev
...
am: fc9f55873a
2016-08-08 23:57:34 +00:00
Kevin Hufnagle
bbedca69e5
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
...
am: 7a13b16dcf
2016-08-08 23:57:31 +00:00
Chris Craik
bbc56855bd
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
...
am: a9bef43149
2016-08-08 23:57:24 +00:00
Chris Craik
152f76ee50
Prevent EndLayerOps when Begin was rejected
...
am: 3c53ec51ef
2016-08-08 23:57:22 +00:00
Android Build Merger (Role)
0402936230
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev
2016-08-08 23:49:30 +00:00
Android Build Merger (Role)
fc9f55873a
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev
2016-08-08 23:49:19 +00:00
Kevin Hufnagle
70f8ca8dff
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
...
am: 87c2ed97b8
2016-08-08 23:48:52 +00:00
Kevin Hufnagle
7a13b16dcf
docs: Revised "Optimizing Content for the Assistant" page.
...
am: d4197234bb
2016-08-08 23:48:50 +00:00
Chris Craik
a9bef43149
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
2016-08-08 23:44:08 +00:00
Hemal Patel
a8e1c75bf6
Docs: Fixed the link that loads Fragments guide
...
In the class description, fixed the reference link that points to the
Fragments guide.
Bug: 29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
2016-08-08 16:43:22 -07:00
Kevin Hufnagle
87c2ed97b8
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
2016-08-08 23:35:27 +00:00
Makoto Onuki
4684672789
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
...
am: 369c6ebf02
2016-08-08 23:20:45 +00:00
Makoto Onuki
bb5db91bf3
ShortcutManager improve app udpate check
...
am: 64183d5188
2016-08-08 23:20:44 +00:00
Christopher Tate
dd7110db2b
Handle empty/unspecified crop properly in wallpaper restore
...
Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.
Bug 30521402
Bug 30274136
Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01
2016-08-08 16:15:52 -07:00
Mark Lu
ee0c57417b
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
...
am: 66847abba6
2016-08-08 23:12:13 +00:00
Jim Miller
fb5ae0abff
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
...
am: 6cb5152e9f
2016-08-08 23:12:08 +00:00
Jim Miller
b08d7677d7
Fix bug where foreground activity fails to cancel auth/enrollment
...
am: 37979c9db0
2016-08-08 23:12:03 +00:00
TreeHugger Robot
369c6ebf02
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
2016-08-08 23:01:43 +00:00
Mark Lu
6fadcab88a
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
...
am: 325399bfb9
2016-08-08 23:00:15 +00:00
Mark Lu
3e3e19d3c8
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
...
am: 9bc63b9bf0
2016-08-08 23:00:12 +00:00
Winson Chung
9bc4d36796
Merge "Reverting ag/1288123" into nyc-mr1-dev
...
am: d983386c31
2016-08-08 23:00:10 +00:00
Mark Lu
66847abba6
docs: fixed generics in data binding code samples am: b1b5efd3be
...
am: 7f703bde72
2016-08-08 23:00:09 +00:00
Winson
5ce0a4fb0f
Reverting ag/1288123
...
am: 08deff0a67
2016-08-08 23:00:07 +00:00
TreeHugger Robot
6cb5152e9f
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
2016-08-08 22:55:06 +00:00
Mark Lu
325399bfb9
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
...
am: a6ee9c1848
2016-08-08 22:49:11 +00:00
Mark Lu
9bc63b9bf0
docs: add info to SharedPreferences.Editor.putString
...
am: fb48521f41
2016-08-08 22:49:08 +00:00
Mark Lu
7f703bde72
docs: fixed generics in data binding code samples
...
am: b1b5efd3be
2016-08-08 22:37:19 +00:00
Mark Lu
95698f127a
docs: fix code snippets in SQL Databases page
...
In the "Saving Data in SQL Databases" page, this commit makes the
following updates:
-the create snippet now includes the subtitle column
-the insert and query snippets no longer references undefined variables
-the delete snippet now references the table with "FeedEntry.TABLE_NAME"
Bug: 25856493
Change-Id: I4fdf8e271a1141776c2427c0b3fef8ec403dc423
2016-08-08 15:35:57 -07:00
Winson Chung
d983386c31
Merge "Reverting ag/1288123" into nyc-mr1-dev
2016-08-08 22:34:00 +00:00
Mark Lu
a6ee9c1848
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
2016-08-08 22:26:36 +00:00
Selim Cinek
9bfba9c157
Made background updater more robust to state changes
...
With raceconditions, the background of notifications could
become colored when dozing.
Change-Id: Ib39f873e6dce40e97a8df06dec281733a8ae2fd9
Fixes: 29331596
2016-08-08 15:20:06 -07:00
Chris Craik
3c53ec51ef
Prevent EndLayerOps when Begin was rejected
...
bug:30537130
BeginLayerOps were being rejected in a way that allowed the associated
EndLayerOps to still be recorded. This was a violation of DisplayList
content expectations, and caused crashes in FrameBuilder when trying to
play these DisplayLists back.
Change-Id: I531b840aa5c4ffb1ee458da3f4b366978eaeafbe
2016-08-08 15:15:58 -07:00
John Reck
4ea119f3b9
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
...
am: 8bcd5bc5b0
2016-08-08 22:04:50 +00:00
John Reck
936166fd5b
Fix currentAnimationTimeMillis to use vsync time
...
am: a2acb4f077
2016-08-08 22:04:48 +00:00
John Reck
8bcd5bc5b0
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
2016-08-08 21:49:04 +00:00
Makoto Onuki
64183d5188
ShortcutManager improve app udpate check
...
- Don't use lastUpdateTime for system apps since it's not reliable.
- Scan downgraded apps too.
Bug 30708050
Bug 30734178
Change-Id: I98253f4c635466197548385275ab08c5e3a1a10b
2016-08-08 14:40:32 -07:00
Doris Liu
186c4e6bed
Merge "Fix infinite AVD not running" into nyc-mr1-dev
...
am: a5dc817c75
2016-08-08 21:23:13 +00:00
Doris Liu
c66c046a18
Fix infinite AVD not running
...
am: 18e08a0170
2016-08-08 21:23:10 +00:00
Doris Liu
a5dc817c75
Merge "Fix infinite AVD not running" into nyc-mr1-dev
2016-08-08 21:03:52 +00:00
Robert Carr
798fb79866
PopupWindow: Be more consistent about Gravity calculation.
...
Currently we are only appending the DISPLAY_CLIP_VERTICAL
if the API user happens to call update() after showAsDropDown().
This fixes that behavior, and fixes a RTL issue (START v. LEFT).
Unblocks a CTS test I am working on.
Bug: 30578621
Change-Id: Ibf838544d453986b66eb223e2ac0f7d909fe5630
(cherry picked from commit 8367c50972
2016-08-08 20:35:17 +00:00
Geoffrey Pitsch
305087991d
BootAnimation system property to play sound.
...
Optional system property "persist.sys.bootanim.play_sound"
If nonexistent, default behavior plays the sound.
Bug: 30690353
Change-Id: Ie5ed456d891632be5ec8be255ac7c1193753c741
2016-08-08 16:18:21 -04:00
Julia Reynolds
a70315d35f
Merge "Restore padding." into nyc-mr1-dev
...
am: 67abc837af
2016-08-08 20:12:30 +00:00
Julia Reynolds
1b6b6911e4
Restore padding.
...
am: eded2fcf7a
2016-08-08 20:12:26 +00:00
Julia Reynolds
67abc837af
Merge "Restore padding." into nyc-mr1-dev
2016-08-08 20:05:53 +00:00
Hemal Patel
86bbfaabdd
Docs: Renamed Google Now to Google Voice Actions
...
This commit contains the following changes:
- Renamed instances of Google Now to Google Voice Actions
- Removed the Intents fired by Google Now section as it is obselete
- Added link to the Google Voice Actions page
- Changed the voice-icon.png's reference link to the System Actions reference
section on the Google Voice Actions page
- Revised the HTML comment and local CSS by replacing Google Now box with
Google Voice Actions box.
Bug: 19501778
Change-Id: I3e4364aaceaff4f5bceb090dd4f8da548dfa5c30
2016-08-08 13:05:42 -07:00
Dianne Hackborn
179fca0241
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
...
am: 154cc8237b
2016-08-08 20:04:00 +00:00
Joe Onorato
d55f7e646f
Have BatteryStats track and report the running wakelocks.
...
am: adbee556a9
2016-08-08 20:03:57 +00:00
Dianne Hackborn
154cc8237b
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
2016-08-08 19:58:57 +00:00
