OSDN Git Service
Robert Carr [Fri, 24 Jun 2016 22:54:53 +0000 (22:54 +0000)]
Merge \\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\" into nyc-dev am:
8afc1f70f0
am:
be87ca9efa
Change-Id: I1d06d427c3679d83d55038f999b75c26d5c8ecc6
Robert Carr [Fri, 24 Jun 2016 22:50:45 +0000 (22:50 +0000)]
Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am:
8afc1f70f0
Change-Id: Ifcc58b9c6a4bdaf3df0dc49ac963bdc7e32aa409
TreeHugger Robot [Fri, 24 Jun 2016 22:43:30 +0000 (22:43 +0000)]
Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev
Yorke Lee [Fri, 24 Jun 2016 22:24:33 +0000 (22:24 +0000)]
Merge \\"Update documentation for View.startDragAndDrop\\" into nyc-dev am:
c63710ea48
am:
d1d3950d94
Change-Id: I19b76a4a8a4d17c4b9accca917280117710546c6
Yorke Lee [Fri, 24 Jun 2016 22:22:02 +0000 (22:22 +0000)]
Merge \\"Update documentation for View.startDragAndDrop\\" into nyc-dev am:
c63710ea48
am:
c9bbca5682
Change-Id: I064b85f0a567978a67ed72a963aea63be9200457
Yorke Lee [Fri, 24 Jun 2016 22:21:19 +0000 (22:21 +0000)]
Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am:
c63710ea48
Change-Id: Iebdb99f1032fbda52686df9dc02e740b61b7e7eb
Yorke Lee [Fri, 24 Jun 2016 22:18:22 +0000 (22:18 +0000)]
Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am:
c63710ea48
Change-Id: I47ee9fa89edc5495616393a1c352677c8b990030
Adam Lesinski [Fri, 24 Jun 2016 22:11:14 +0000 (22:11 +0000)]
Merge \"Update DisplayMetrics when resizing\" into nyc-mr1-dev
am:
038084e61c
Change-Id: I82318bbd8dbf03ab4bc01533b8c5650306cff0aa
Yorke Lee [Fri, 24 Jun 2016 22:10:46 +0000 (22:10 +0000)]
Merge "Update documentation for View.startDragAndDrop" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 22:04:14 +0000 (22:04 +0000)]
Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev
Makoto Onuki [Fri, 24 Jun 2016 21:42:54 +0000 (21:42 +0000)]
Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev
am:
1af9a58956
Change-Id: Id878608aec49985228e129de9736b751c9ae8567
TreeHugger Robot [Fri, 24 Jun 2016 21:36:36 +0000 (21:36 +0000)]
Merge "Shortcut: Only "main" activities can have shortcuts." into nyc-mr1-dev
Robert Carr [Fri, 24 Jun 2016 20:58:16 +0000 (13:58 -0700)]
PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.
When we want the WindowManager to clip our requested width/height
to the display frame, we need to pass DISPLAY_CLIP_VERTICAL/HORIZONTAL.
It seems this behavior was unintentionally applied without this flag
in previous releases.
Bug:
29602363
Change-Id: Ib98060e36efde0dbaabb59a758da5374035dbb62
Fyodor Kupolov [Fri, 24 Jun 2016 20:53:09 +0000 (20:53 +0000)]
Merge \"Prevent NPE in dispatchUserSwitch\" into nyc-mr1-dev
am:
340105677e
Change-Id: I73dc2ce8949b27bfc77634dc6be4dfbffc9ffa56
Andrew Sapperstein [Fri, 24 Jun 2016 20:53:04 +0000 (20:53 +0000)]
Merge \"Properly tint crash dialog.\" into nyc-mr1-dev
am:
44d909c971
Change-Id: Id2f1f4c9e9f9f3ba96ff501121d2ec9d806ddfb7
Fyodor Kupolov [Fri, 24 Jun 2016 20:49:09 +0000 (20:49 +0000)]
Merge "Prevent NPE in dispatchUserSwitch" into nyc-mr1-dev
Fyodor Kupolov [Fri, 24 Jun 2016 20:46:18 +0000 (13:46 -0700)]
Prevent NPE in dispatchUserSwitch
Access to mCurWaitingUserSwitchCallbacks should be synchronized and it's
safer to access the local variable curWaitingUserSwitchCallbacks
Bug:
29039588
Change-Id: Id91699670ca16467d385f476ba06da2cb29a984b
TreeHugger Robot [Fri, 24 Jun 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Properly tint crash dialog." into nyc-mr1-dev
Mitchell Wills [Fri, 24 Jun 2016 20:31:44 +0000 (20:31 +0000)]
Merge \"Don\'t save the anonymous identity for EAP-SIM/AKA/AKA-Prime\" into nyc-mr1-dev
am:
015c8a3ac0
Change-Id: Ica7d71eb2884b8a7861f31902313ab8b2a713967
Mitchell Wills [Fri, 24 Jun 2016 20:24:12 +0000 (20:24 +0000)]
Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 24 Jun 2016 20:17:34 +0000 (20:17 +0000)]
Merge "Reapply more strings for \\"more settings\\" am:
de383c75eb am:
0dfa15fd05" into nyc-mr1-dev-plus-aosp
Mitchell Wills [Thu, 16 Jun 2016 23:51:26 +0000 (16:51 -0700)]
Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.
TEST: Patch was validated by original reporter
Enterprise tests pass (b/
29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes:
28161335
Min Yun [Fri, 24 Jun 2016 20:17:12 +0000 (20:17 +0000)]
Reapply more strings for \\"more settings\\" am:
de383c75eb
am:
0dfa15fd05
Change-Id: Ida898d6fc96778c93d3ad994cd326835e4ef693a
Min Yun [Fri, 24 Jun 2016 20:16:57 +0000 (20:16 +0000)]
Reapply more strings for \\"more settings\\" am:
de383c75eb
am:
dd962fd1bd
Change-Id: I25b4e7eed06e3bcbdab1778f04f052fc8cd1ddad
Adam Lesinski [Fri, 24 Jun 2016 19:29:16 +0000 (12:29 -0700)]
Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.
Bug:
29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
Min Yun [Fri, 24 Jun 2016 20:10:14 +0000 (20:10 +0000)]
Reapply more strings for \"more settings\"
am:
de383c75eb
Change-Id: Ib63f9af9c2a25934927bc9b51de8fcc94a753f05
Min Yun [Fri, 24 Jun 2016 20:10:02 +0000 (20:10 +0000)]
Reapply more strings for \"more settings\"
am:
de383c75eb
Change-Id: I4d31eb5dd262e68542af4360da062ecdb3ff822f
Makoto Onuki [Thu, 23 Jun 2016 21:05:46 +0000 (14:05 -0700)]
Shortcut: Only "main" activities can have shortcuts.
- Don't publish shortcuts when their target activities are not main.
- Only scan manifest shortcuts for main activities.
- When an app is updated, remove shortcuts that no longer belong to
valid main activities.
- Also re-publish manifest shortcuts after 'clear data'
- Also listen to PACKAGE_CHANGED and disable/re-publish shortcuts
properly.
Bug
29355786
Bug
29582255
Bug
29601844
Change-Id: I6c701ce669cf30a227bc2af4aa01de467ef73e3a
Andrew Sapperstein [Fri, 24 Jun 2016 19:11:09 +0000 (12:11 -0700)]
Properly tint crash dialog.
Change-Id: I6a74b08acd5e13c750ce512e61518972cc55940b
FIXES:
29619712
Chong Zhang [Fri, 24 Jun 2016 19:00:24 +0000 (19:00 +0000)]
Merge \"Do not load exit animation again if window is already animating\" into nyc-mr1-dev
am:
1156c52b03
Change-Id: I83b51a39eb515703d3cd648086574e4e634f4bea
Chong Zhang [Fri, 24 Jun 2016 18:51:13 +0000 (18:51 +0000)]
Merge "Do not load exit animation again if window is already animating" into nyc-mr1-dev
Andrew Sapperstein [Fri, 24 Jun 2016 18:42:12 +0000 (18:42 +0000)]
Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev
am:
411b9c69a1
Change-Id: I8742ff9342285bfb72f7f8cf68226a0d46d6d880
Andrew Sapperstein [Fri, 24 Jun 2016 18:35:48 +0000 (18:35 +0000)]
Merge \"Update QS battery trendline to use theme color.\" into nyc-mr1-dev
am:
3d29644f28
Change-Id: I05814fb1551543294aa3bf0b254d0d5e17ff417e
Andrew Sapperstein [Fri, 24 Jun 2016 18:31:41 +0000 (18:31 +0000)]
Merge "Add DeviceDefault style used by ringtone picker." into nyc-mr1-dev
Chong Zhang [Fri, 24 Jun 2016 18:23:06 +0000 (11:23 -0700)]
Do not load exit animation again if window is already animating
Transition can be started as soon as the entering app is drawn.
If the exiting app relayouts to invisible after transition started,
don't load the exit animation again.
bug:
29405575
Change-Id: I05ba4f733afb9426626db113be721a6bf888f093
Min Yun [Fri, 24 Jun 2016 18:05:03 +0000 (11:05 -0700)]
Reapply more strings for "more settings"
Fixes:
29620816
Change-Id: Iabfcb3b762e1d7d105d2b4c417fc0902d7e7ca16
Andrew Sapperstein [Fri, 24 Jun 2016 18:19:30 +0000 (18:19 +0000)]
Merge "Update QS battery trendline to use theme color." into nyc-mr1-dev
Doris Liu [Fri, 24 Jun 2016 17:53:06 +0000 (17:53 +0000)]
Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
am:
7f9c189f06
Change-Id: I3ea0e652dd39dfffe279b4c2c0bb19d362eb91af
Doris Liu [Fri, 24 Jun 2016 17:47:43 +0000 (17:47 +0000)]
Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev
Makoto Onuki [Fri, 24 Jun 2016 17:43:18 +0000 (17:43 +0000)]
Merge \"Make \"cmd package set-home-activity\" more CTS friendly\" into nyc-mr1-dev
am:
2a6f79d45f
Change-Id: I09289508e106f0afe34ab266453b296e97910a26
Bill Yi [Fri, 24 Jun 2016 17:38:17 +0000 (17:38 +0000)]
Import translations. DO NOT MERGE am:
34f5924ca6 -s ours
am:
27465d7d0e -s ours
Change-Id: I51b04e6def8892beaa909a88c46f8716e1b3b3b4
Makoto Onuki [Fri, 24 Jun 2016 17:37:06 +0000 (17:37 +0000)]
Merge "Make "cmd package set-home-activity" more CTS friendly" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 17:33:14 +0000 (17:33 +0000)]
Import translations. DO NOT MERGE am:
34f5924ca6 -s ours
am:
f7c19ca80f -s ours
Change-Id: Id3ef2b412058aa7e306c00bb4e8b01f4acb09298
Bill Yi [Fri, 24 Jun 2016 17:28:18 +0000 (17:28 +0000)]
Import translations. DO NOT MERGE
am:
34f5924ca6 -s ours
Change-Id: Iddaaa1eb8c715a66a3d3fab95f0ac4eba2865877
Bill Yi [Fri, 24 Jun 2016 17:23:28 +0000 (17:23 +0000)]
Import translations. DO NOT MERGE
am:
34f5924ca6 -s ours
Change-Id: I7b2fb02e671ba6c421f0443a98a1756f9b7f2a98
Yi Kong [Fri, 24 Jun 2016 17:10:51 +0000 (17:10 +0000)]
Merge \\\"Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" am:
f388075f8f am:
a153a22f80
am:
48e5206081
Change-Id: Id33bfdd2b7e68dace00ffb2b22731b6d31a61659
Yi Kong [Fri, 24 Jun 2016 17:04:42 +0000 (17:04 +0000)]
Merge \\"Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259\\" am:
f388075f8f
am:
a153a22f80
Change-Id: Iaab8f3a6fc68ab42a4061cc68b3de92a4f859c25
Yi Kong [Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)]
Merge \\"Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am:
a725dbd6c7
am:
79f65e5d67
Change-Id: I02446be0c5ce1840dcb21b4019b7a02cf0bee3f5
Yi Kong [Fri, 24 Jun 2016 16:55:48 +0000 (16:55 +0000)]
Merge \"Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259\"
am:
f388075f8f
Change-Id: I5f595620ecea5f4f05da90673414b7b130c7b848
Yi Kong [Fri, 24 Jun 2016 16:55:38 +0000 (16:55 +0000)]
Merge \"Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
am:
a725dbd6c7
Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
Yi Kong [Fri, 24 Jun 2016 16:47:30 +0000 (16:47 +0000)]
Merge "Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master
Yi Kong [Fri, 24 Jun 2016 16:47:02 +0000 (16:47 +0000)]
Suprabh Shukla [Fri, 24 Jun 2016 16:36:55 +0000 (16:36 +0000)]
Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am:
bb1fb395ca
Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
Amith Yamasani [Fri, 24 Jun 2016 16:08:02 +0000 (16:08 +0000)]
Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 15:33:56 +0000 (08:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29578243
Change-Id: Ibfcaf1dcbb2cc51dcec359edb8525a2a56ab1231
Android Build Merger (Role) [Fri, 24 Jun 2016 15:22:23 +0000 (15:22 +0000)]
Merge "Always reapply strings. am:
9c0c3d8d8b am:
630cc3017a" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 24 Jun 2016 15:21:53 +0000 (15:21 +0000)]
Always reapply strings. am:
9c0c3d8d8b
am:
630cc3017a
Change-Id: I40820f34ff51a4ad690d0fe37c912ac84df5deb9
Julia Reynolds [Fri, 24 Jun 2016 15:21:51 +0000 (15:21 +0000)]
Always reapply strings. am:
9c0c3d8d8b
am:
6a030524d8
Change-Id: Ic941db9999d8098ab8608dd136822da6e65b36db
Julia Reynolds [Fri, 24 Jun 2016 15:16:36 +0000 (15:16 +0000)]
Always reapply strings.
am:
9c0c3d8d8b
Change-Id: I8e553022cf6f877c3f7394fd365cb4051df2953f
Julia Reynolds [Fri, 24 Jun 2016 15:16:35 +0000 (15:16 +0000)]
Always reapply strings.
am:
9c0c3d8d8b
Change-Id: I20ad505b3cb75319cc81a3dfb6ecfd0fae9ac24a
Julia Reynolds [Fri, 24 Jun 2016 15:03:02 +0000 (15:03 +0000)]
Merge \"Show volume row headers by default.\" into nyc-mr1-dev
am:
459f594bb1
Change-Id: Ie39c93bec6afa7084ddfe3bca68384f42eaae152
TreeHugger Robot [Fri, 24 Jun 2016 14:52:39 +0000 (14:52 +0000)]
Merge "Show volume row headers by default." into nyc-mr1-dev
Julia Reynolds [Wed, 15 Jun 2016 16:53:31 +0000 (12:53 -0400)]
Show volume row headers by default.
Bug:
28269951
Change-Id: I26acfb26064e7f44e4b1897d940228247b45d7b1
Julia Reynolds [Fri, 24 Jun 2016 12:44:57 +0000 (08:44 -0400)]
Always reapply strings.
Change-Id: Icc66d1e23048d2676b5776c3eec76345963228d0
Fixes:
29620816
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:58:07 +0000 (11:58 +0000)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a am:
ab3d167f06
am:
3606de0fb4
Change-Id: I65867f77e21821fdcd62247bf242def4807f09dd
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:53:57 +0000 (11:53 +0000)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a
am:
ab3d167f06
Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:38:01 +0000 (11:38 +0000)]
Merge \\\"Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am:
36ce097dbb am:
12bb15c1d3
am:
387191bc64
Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:33:42 +0000 (11:33 +0000)]
Merge \\"Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am:
36ce097dbb
am:
12bb15c1d3
Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd
Przemyslaw Szczepaniak [Wed, 22 Jun 2016 15:51:48 +0000 (16:51 +0100)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a
version with test-current.txt
Bug:
28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:23:01 +0000 (11:23 +0000)]
Merge \"Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am:
36ce097dbb
Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Przemyslaw Szczepaniak [Mon, 20 Jun 2016 16:49:43 +0000 (17:49 +0100)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a
This change reverts previous fix for b/
27582395 and makes
AbstractStringBuffer an Appendable.
Bug:
28666126
Bug:
27582395
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
Yi Kong [Wed, 22 Jun 2016 13:17:55 +0000 (14:17 +0100)]
Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259
Bug:
29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
(cherry picked from commit
fdbf33126ee9d4972ccde4e4ac23cf7074b5b3ed)
Bill Yi [Fri, 24 Jun 2016 06:02:31 +0000 (06:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f1dc57ea63 -s ours
am:
f0101fd5cb -s ours
Change-Id: I68b6a3c5efc104bcff05b5b52b618102b54b05ac
Bill Yi [Fri, 24 Jun 2016 06:02:26 +0000 (06:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
2bc13bcdad -s ours
am:
3e9917dc91 -s ours
Change-Id: I10946d0fa4e33dfedb60c9f3a37318fd4adbd991
Bill Yi [Fri, 24 Jun 2016 05:57:51 +0000 (05:57 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f1dc57ea63 -s ours
am:
7b07bb374b -s ours
Change-Id: Id0464b5911357d2fc7e57f3fbcc5649c5bf2652e
Bill Yi [Fri, 24 Jun 2016 05:57:49 +0000 (05:57 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
2bc13bcdad -s ours
am:
b8f7854c9a -s ours
Change-Id: I71b65664e5aaa02b36d752a9b57c17281225f115
Bill Yi [Fri, 24 Jun 2016 05:53:23 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
97da29c710 -s ours
Change-Id: I42bed2974bc84494f2fa917d91011948fda9c773
Bill Yi [Fri, 24 Jun 2016 05:53:19 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f1dc57ea63 -s ours
Change-Id: I9bf852b6f99959a8bd9f50395115c5d1c4b0850e
Bill Yi [Fri, 24 Jun 2016 05:53:19 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
282bf31a0b -s ours
Change-Id: I1e2e10f46463fc20765fb5c85814b81cf153afba
Bill Yi [Fri, 24 Jun 2016 05:53:16 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
2bc13bcdad -s ours
Change-Id: I2ff90e0c847b2c99099509802e0b5be4eaa04cff
Bill Yi [Fri, 24 Jun 2016 05:53:11 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f1dc57ea63 -s ours
Change-Id: Ie112f5004629cdd2fd0216eaa9b94bf4e45c6928
Bill Yi [Fri, 24 Jun 2016 05:53:08 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
2bc13bcdad -s ours
Change-Id: Ibaab32fdbf118c13beec0ba8999404492ec9b2e8
TreeHugger Robot [Fri, 24 Jun 2016 05:44:41 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:44:25 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:44:09 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:43:20 +0000 (05:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Andrew Sapperstein [Fri, 24 Jun 2016 04:14:17 +0000 (21:14 -0700)]
Add DeviceDefault style used by ringtone picker.
Change-Id: I9f03903678451a198d1100bc1513d4371e7f1e61
FIXES:
29619195
Andrew Sapperstein [Fri, 24 Jun 2016 00:53:01 +0000 (17:53 -0700)]
Update QS battery trendline to use theme color.
Color is the same, but it's now defined in colors_device_defaults.
Change-Id: I984179968943bb1930d8a7418e9c7f4b9c95482a
FIXES:
29614022
Adrian Roos [Fri, 24 Jun 2016 02:12:40 +0000 (02:12 +0000)]
Merge \\"Improve ANR dropbox reports\\" into nyc-dev am:
594c9cb356
am:
ffc89988d2
Change-Id: I55a7d1234befb0df4a767a6410b796cf0a325d9c
Adrian Roos [Fri, 24 Jun 2016 02:09:22 +0000 (02:09 +0000)]
Merge \\"Improve ANR dropbox reports\\" into nyc-dev am:
594c9cb356
am:
fe45e68667
Change-Id: I067c42ea4ec354713ad546c4673fd8e275aa3feb
Adrian Roos [Fri, 24 Jun 2016 02:05:26 +0000 (02:05 +0000)]
Merge \"Improve ANR dropbox reports\" into nyc-dev
am:
594c9cb356
Change-Id: Ic3c8b1c5fc1c1b9c2c5e5d8df48d072269a92cc6
Adrian Roos [Fri, 24 Jun 2016 02:05:16 +0000 (02:05 +0000)]
Merge \"Improve ANR dropbox reports\" into nyc-dev
am:
594c9cb356
Change-Id: I39fc6a0a96a2df6b6653c802a4c4d5bd769faf84
Adrian Roos [Fri, 24 Jun 2016 01:57:42 +0000 (01:57 +0000)]
Merge "Improve ANR dropbox reports" into nyc-dev
Android Build Merger (Role) [Fri, 24 Jun 2016 01:33:38 +0000 (01:33 +0000)]
Merge "Merge \"Access internal ringer mode to properly vibrate in DND am:
dcbdc0df43\" into nyc-mr1-dev am:
15bfd442c2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 24 Jun 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev am:
e3f410cd59" into nyc-mr1-dev-plus-aosp
Brad Ebinger [Fri, 24 Jun 2016 01:32:59 +0000 (01:32 +0000)]
Merge \"Access internal ringer mode to properly vibrate in DND am:
dcbdc0df43\" into nyc-mr1-dev
am:
15bfd442c2
Change-Id: If800b9da1b29f7e72b1110395fc8d6fec5ed03ee
Jorim Jaggi [Fri, 24 Jun 2016 01:32:49 +0000 (01:32 +0000)]
Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
am:
e3f410cd59
Change-Id: Id4486196793d8cc82ee6b4a230bf357785a7842f
Brad Ebinger [Fri, 24 Jun 2016 01:32:04 +0000 (01:32 +0000)]
Access internal ringer mode to properly vibrate in DND am:
dcbdc0df43
am:
bc26a90b51
Change-Id: I5dc1ba9038d4f536397d5ac76f83b5925e1b087c
Adrian Roos [Thu, 23 Jun 2016 23:38:06 +0000 (16:38 -0700)]
Improve ANR dropbox reports
Work towards better diagnosing b/
29501073. Adds logic to ensure that the dropbox
entry generated for ANRs fits at least some part of the logcat before the MAX_DROPBOX_SIZE
mark. Also reduces the MAX_DROPBOX_SIZE to be better match size restrictions.
Bug:
29501073
Change-Id: Ice5599582cbb536b7d81aa0c0340ff753ca86ebf
OSDN Git Service
