Commit Graph

277611 Commits

Author SHA1 Message Date
Matthew Tait
48df472c68 Changes styling on number, date and time pickers. am: 87f8b8c545
am: 080ba71c1a

Change-Id: I70a2b71493c11ed554cb1bc0bc66d91f7d6d5174
2016-08-03 20:16:18 +00:00
Selim Cinek
293d82d840 Merge "Improved vibration feedback completely" into nyc-mr1-dev am: c9682ab5b5 am: d7eb8794da
am: 74e85798e2

Change-Id: I36ff3c82797882c3052fd63ea241c375c7cd5570
2016-08-03 20:16:15 +00:00
Selim Cinek
de549a5102 Improved vibration feedback completely am: 0fc298ffc7 am: de55d281c0
am: 99831520c5

Change-Id: Ie8e385bb628cb4e3a9e8d8aa2475cc8a5d007dc7
2016-08-03 20:16:10 +00:00
Alexandria Cornwall
cc455deae0 Merge "AAPT2: Strip dedicated tools namespace from XML" 2016-08-03 20:03:13 +00:00
Jim Miller
38c660e526 Disable systemui navigation events while keyguard is showing am: 1c21fc5e0a am: dbc584409d
am: 0d955d59d7

Change-Id: If54de1d566aa1942255a0018c774a37922f9faf8
2016-08-03 19:52:31 +00:00
John Stultz
40dcffe7ac Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3 am: 5e23ab394a am: 55b3a9ceb3
am: 15cb51e04a

Change-Id: Ia4fbf6264a6ee6806b1c44d00249ce74b5999f3b
2016-08-03 19:52:27 +00:00
Ruben Brunk
0bc1ab416e Merge "Fix component management in VrManagerService." into nyc-mr1-dev am: 964d6914ff am: 99940d7a89
am: c185662625

Change-Id: If45adcd3fb64cad731a9e43d430ba35cf4edd45c
2016-08-03 19:52:23 +00:00
Ruben Brunk
83a73b8776 Fix component management in VrManagerService. am: 1f4f26b1d5 am: 6bddc28000
am: eb7028d3c5

Change-Id: I573eb86b003d618caae3e23f5c1d58e59b7261ce
2016-08-03 19:52:20 +00:00
Dianne Hackborn
0bb0d567d9 Merge "Fix issue #30601353: Don't warn of non-protected explicit intent broadcasts" into nyc-mr1-dev am: 7841042a83 am: aab396d24f
am: fa5c6f04b8

Change-Id: Iabb3186504cbfb39e2e1281ee2fe31ce61a2176a
2016-08-03 19:52:15 +00:00
Dianne Hackborn
2642cc3f83 Fix issue #30601353: Don't warn of non-protected explicit intent broadcasts am: de8572d931 am: 88fe0c260b
am: 1a7c4f46f2

Change-Id: I4efc1d12d37a1d2b9ad0d8bd80e455bdc8aa8a31
2016-08-03 19:49:50 +00:00
Joe Fernandez
570d243733 cherry-pick from nyc-dev: docs: SafeBrowsing API am: 741757f27f am: 328a6a12eb am: 465004fe6b am: a425123ea8
am: 69bc6945d0

Change-Id: Ia4edc7a94a9a0375f614bd018959f51e18425759
2016-08-03 19:49:46 +00:00
Andrew Solovay
818cd342d9 cherry-pick from nyc-dev: docs: SafeBrowsing API am: 741757f27f am: 328a6a12eb am: 2068960d68
am: c49793f127

Change-Id: I0ac45243c2ce4408e1c1fad3bc81991da20c71c3
2016-08-03 19:49:43 +00:00
Kevin Hufnagle
6ad99050fa Resolve merge conflicts of ffb4eb1 to nyc-dev am: a5abfee3a5 am: af74842e3a am: f3c613335a
am: fe8d155268

Change-Id: I5000d8baf875d3b09562572fd87cd59530dfa326
2016-08-03 19:49:39 +00:00
Joe Fernandez
053ae26d56 Resolve merge conflicts of ffb4eb1 to nyc-dev am: a5abfee3a5 am: 553191dd26
am: c11493d1bc

Change-Id: I5054b9e46eaec302654321dfcbea8b88eda71abb
2016-08-03 19:49:35 +00:00
Yigit Boyar
a236e0b6f7 Merge "Target API check for margin params fix" into nyc-mr1-dev am: 828d4ff61d am: 8ef047b974
am: 6b36f8c1f7

Change-Id: I25304e622a3a28191c74974fa9a0a91e8f7cb4ae
2016-08-03 19:46:36 +00:00
Yigit Boyar
bb1115f1ff Target API check for margin params fix am: 2dd20a61e9 am: 6efd207022
am: 5eede8910b

Change-Id: I748d223c4dcec4f0234b0e4e808ae982efbd0bd5
2016-08-03 19:46:33 +00:00
Doris Liu
d0707e9b33 Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev am: a3c35852a1 am: a57431ce2b
am: 6dc767899f

Change-Id: I6a8dd81f8a292010dc798298c962e9ea5b06065d
2016-08-03 19:46:29 +00:00
Doris Liu
eba351df16 Ensure layer update include the dirty rect from AVD am: b51b2864e8 am: c0dccb9597
am: 334d32137f

Change-Id: I20bf02209a269d6bef3085ae07caade7680b065d
2016-08-03 19:46:26 +00:00
Makoto Onuki
ff990d2f63 Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev am: f77b6620d1 am: f58bd641f1
am: ded6dd050c

Change-Id: I9c0f7766c414cf2ee12e5be25906add6cc0274ea
2016-08-03 19:46:22 +00:00
Makoto Onuki
1db5202fca ShortcutManager: rescan all apps after next OTA am: 4dd032d5a6 am: 74f4689f34
am: b997b64dcf

Change-Id: If5e939ae3718201c713ed59241cc8148e65a7078
2016-08-03 19:43:22 +00:00
Doris Ling
9a8c654a43 Merge "Add metrics logging for fingerprint swipe for notification panel." into nyc-mr1-dev am: 174a074eb2 am: d93396b4ec
am: fbdc2b89f8

Change-Id: I74d378833ae75b73f236d8b215d223433e236690
2016-08-03 19:43:18 +00:00
Doris Ling
8d7213f0b7 Add metrics logging for fingerprint swipe for notification panel. am: 3c00afba0b am: ed1c7ba70e
am: 53c39ff132

Change-Id: Ia0e2926f96bb2d6e1003b3c0f453b4980e986675
2016-08-03 19:43:13 +00:00
Felipe Leme
dce89313bc Merge "Removed redundant call to updateRulesForRestrictPowerUL()." into nyc-mr1-dev am: ca69bd37a9 am: 0710ea46e6
am: 39fc23321a

Change-Id: I8482d0597083a88995ae956441a0fde5cacb23e9
2016-08-03 19:43:08 +00:00
Felipe Leme
d43d8ce819 Removed redundant call to updateRulesForRestrictPowerUL(). am: 7e6d8e2236 am: 893c6bd832
am: 2735eda600

Change-Id: I86debb83a5ef670e75d93ee3ac6413e0da16dedb
2016-08-03 19:43:03 +00:00
Adrian Roos
7af4fd65cd Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev am: 87fab000c5 am: eaf7018d07
am: c8183422cc

Change-Id: Ia0ab84449f008a331d2234b24e77436f7264c941
2016-08-03 19:39:58 +00:00
Adrian Roos
b935197c72 SystemUI: Fix crash from bad notifications am: 95f8bea461 am: 9385517f36
am: 5a846a8637

Change-Id: Ic1d21b607b2fd1e503fc45c9d84e9c030c1fc75d
2016-08-03 19:39:55 +00:00
Adrian Roos
67d5869b90 Merge "DozeLog: Properly initialize" into nyc-mr1-dev am: 9923784efc am: cae7484029
am: 1b30b7043a

Change-Id: I954d92e806272d301b187eed6dd7b651c60ad8f2
2016-08-03 19:39:49 +00:00
Adrian Roos
b191a9c924 DozeLog: Properly initialize am: 23c14fc01c am: e4a4652a3a
am: 401cd0d0ae

Change-Id: Iddd954e862d2dee566f708a8bc31a4261600811c
2016-08-03 19:39:45 +00:00
Jorim Jaggi
1e031cc666 Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev am: 1340221244 am: 3e3896655d
am: c51724fb2b

Change-Id: Ib7b535eb212d021108a000f01252940941e3b335
2016-08-03 19:37:28 +00:00
Jorim Jaggi
e1261d8533 Merge "resolve merge conflicts of 3c1b0f0 to master" 2016-08-03 19:25:52 +00:00
TreeHugger Robot
7475ba9a7d Merge "Removed unused imports and fixed copyright notice." 2016-08-03 19:11:34 +00:00
Felipe Leme
cec3844b6d Removed unused imports and fixed copyright notice.
BUG: 30429392
Change-Id: I3c849e507437ef733b04954af68bd47d00dc5165
2016-08-03 10:03:30 -07:00
Alexandria Cornwall
a9ff14098b AAPT2: Strip dedicated tools namespace from XML
Android has a dedicated XML namespace dedicated for tools that should not be
included in the final APK. AAPT strips this out, but the feature was missing
from AAPT2. See: http://tools.android.com/tech-docs/tools-attributes

Bug: 29115919
Change-Id: I8f4fc79e6c8592a313a691134e44d16fd91f36ed
2016-08-03 10:02:15 -07:00
Jorim Jaggi
526694ea52 resolve merge conflicts of 3c1b0f0 to master
Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db
2016-08-03 16:23:28 +00:00
Diego Perez
a4a100d206 Merge "ImageSwitcher -> ImageView in appcompat inflate" 2016-08-03 15:41:04 +00:00
Diego Perez
689a1093a6 Merge "Try to resolve IDs also as enums" 2016-08-03 15:34:31 +00:00
Felipe Leme
3e27a25b2c Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev am: f7ac45a33b am: edbb5d5612
am: 23e9c56c24

Change-Id: Ic5aaaea685e0f117d51af46b415e68580537af2b
2016-08-03 14:53:54 +00:00
Felipe Leme
625fc43181 Use SurfaceControl.screenshot() instead of screencap for screenshots. am: aba9743643 am: ce61b5715d
am: 8cfc23f434  -s ours

Change-Id: I31f2aeefcc4c43d32e617ecb0cb4d66c12be9d01
2016-08-03 14:53:50 +00:00
Matt Sarett
29c32cd2d5 Remove unused include SkNinePatch.h
Change-Id: I4c34d21633fd4f3d4b1403e3bb473dc2cbd245cd
2016-08-03 13:36:34 +00:00
Kirill Grouchnikov
95288e41a5 Merge "Document exception throwing in TabHost" 2016-08-03 13:16:08 +00:00
Matthew Tait
080ba71c1a Changes styling on number, date and time pickers.
am: 87f8b8c545

Change-Id: I78858b4f02b432576c3910c306b71d3f75f6bbd5
2016-08-03 08:18:49 +00:00
Hyundo Moon
686bcc524a Merge "MediaBrowser: Supplement JavaDoc of MediaItem.getMediaId()" 2016-08-03 02:49:25 +00:00
Sungsoo Lim
7d16115451 Merge "MediaSession: Add methods for setting shuffle and repeat modes" 2016-08-03 02:43:29 +00:00
TreeHugger Robot
7175498cfe Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." 2016-08-03 02:20:39 +00:00
Hyundo Moon
1574838142 MediaBrowser: Supplement JavaDoc of MediaItem.getMediaId()
This CL adds link to MediaMetadata.METADATA_KEY_MEDIA_ID
into the JavaDoc of MediaItem.getMediaId() to help developers
easily find what the MediaId is.

Bug: 28790407
Change-Id: Icdcc98ffe59e1480df9ac85fe22b710ecd9d14de
2016-08-03 10:53:45 +09:00
TreeHugger Robot
ed2e7c894e Merge "Have BatteryStats track and report the running wakelocks." 2016-08-03 01:49:50 +00:00
TreeHugger Robot
423922cc4d Merge "Added AccountManagerService tests for continuous testing" 2016-08-03 01:17:31 +00:00
Selim Cinek
74e85798e2 Merge "Improved vibration feedback completely" into nyc-mr1-dev am: c9682ab5b5
am: d7eb8794da

Change-Id: Iddd343b7c43f711387f461e98af1a346b744f84b
2016-08-03 01:11:33 +00:00
Selim Cinek
99831520c5 Improved vibration feedback completely am: 0fc298ffc7
am: de55d281c0

Change-Id: I6aeb82701087c050c296b37df202350040259169
2016-08-03 01:11:30 +00:00
Jim Miller
0d955d59d7 Disable systemui navigation events while keyguard is showing am: 1c21fc5e0a
am: dbc584409d

Change-Id: If1511a7ccd62326d9e9e0f0497711b22f4c93ab5
2016-08-03 01:11:26 +00:00