283353 Commits

Author SHA1 Message Date
Christopher Tate
19b632dc28 Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062 am: e9ca3ec441 am: 69bac672b4 am: 7cdeaf53bb
am: 4d7e5602a6

Change-Id: I708076932a95f6112ddddd4fb3925be7562124bd
2016-08-31 04:25:24 +00:00
Christopher Tate
94702ed0b5 Eliminate next-alarm-clock broadcast flapping am: c60da1edc1 am: ef05b70110 am: 4da1432fe6 am: c786c2663e
am: 528f552d59

Change-Id: I2ba4fc51a4b0c6902c74981a70bb607d12dac771
2016-08-31 04:25:19 +00:00
Philip P. Moltmann
45c4aa3607 Merge "Size print destination to support font sizing" into nyc-mr1-dev am: 47758a178a am: 3db1001247
am: 19e6ab4749

Change-Id: I1e3bcf7b214951f7f702c75684da013ac78d6b6a
2016-08-31 04:17:48 +00:00
Philip P. Moltmann
ff7bc7c394 Size print destination to support font sizing am: cb1926afba am: c0bbf28dca
am: daf21fa96e

Change-Id: I049ba545e75d5345fe67d000553388f36d36a128
2016-08-31 04:17:38 +00:00
Pankaj Kanwar
339258e111 Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev am: d5b8c80b51 am: 30fc10364a am: 1715ca3f15
am: b0235d3c9f

Change-Id: Ia1a1caef85f8713f99988353dd8ba452bd8ea71b
2016-08-31 04:17:27 +00:00
Tyler Gunn
d7e6f260cb Update InCallService#onConnectionEvent comments. am: 06f3fa66b7 am: e3222569c2 am: 837186e18f
am: a71f7d76dd

Change-Id: Idbf160bf09ad99ed13824b1a811edde6afd28d9a
2016-08-31 04:17:17 +00:00
Andrii Kulian
992f50cdfb Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed am: 2f1662f524 am: 6f200e6933 am: 26d5345d30
am: 70bf1579bb  -s ours

Change-Id: I93527b07f1e63b6ad013e679deed93f7f77ea39f
2016-08-31 04:17:07 +00:00
Andrii Kulian
57dff939ab DO NOT MERGE -- Fix finishing activity in non-focused stack am: 772c598f66 am: 35c3c8ee8d am: 6a4d45f796 am: 2560a6cd2d
am: 1295b46950  -s ours

Change-Id: I2397ec0b246cc712698596b27a99b5c5b92e017d
2016-08-31 04:14:00 +00:00
Jorim Jaggi
bdde55e54d Merge "Fix flicker while booting" into nyc-mr1-dev am: 02405fb349 am: 1236822121
am: e0097c8413

Change-Id: I9721d1c38b6e8f9b845c67b16348c9d524a54e3d
2016-08-31 04:13:56 +00:00
Jorim Jaggi
d7e12a92c7 Fix flicker while booting am: 77cbe79b74 am: 49e5c88eda
am: 46a8341458

Change-Id: Ia20d301b9f7e4fe921b8c467002fd2759983e581
2016-08-31 04:13:53 +00:00
Tao Bao
7fa35fafc9 Merge "Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910 am: 40d926f4d4 am: 7b0db6bf48" into nyc-mr1-dev-plus-aosp
am: 4ace626354

Change-Id: I17125450764f769fa6eb3f06589f4a282f027ab7
2016-08-31 04:13:48 +00:00
Tao Bao
f79c28f6bc Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910 am: 40d926f4d4 am: 7b0db6bf48
am: 184ff7a1ee

Change-Id: I2dccbba658d504c93a4f09383b329e6d7d69fba6
2016-08-31 04:13:45 +00:00
Andrii Kulian
e202d03789 Merge "Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9 am: 934da4e400 am: 199d4902e2 am: e77dfe6c74" into nyc-mr1-dev-plus-aosp
am: c3db6a332d  -s ours

Change-Id: Ib60ec5041c31a18688f6add8f3f04ef5a0a6969a
2016-08-31 04:13:35 +00:00
Andrii Kulian
e5307df3d8 Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9 am: 934da4e400 am: 199d4902e2 am: e77dfe6c74
am: 61dd3e6964  -s ours

Change-Id: I7032dc3bbc9df49f31dd2d9d8e396a0ddced7448
2016-08-31 04:13:33 +00:00
Andrii Kulian
b177e62042 Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack am: 620040db3f -s ours am: febd5c027c am: 8428bfa6e5 am: 91c0b43734" into nyc-mr1-dev-plus-aosp
am: 081c553b15  -s ours

Change-Id: Id245690113e9201905073e226c7243facdaa90ba
2016-08-31 04:05:30 +00:00
Andrii Kulian
abe1cdcea1 DO NOT MERGE -- Correctly finish activity in non-focused stack am: 620040db3f -s ours am: febd5c027c am: 8428bfa6e5 am: 91c0b43734
am: fe4a9ab428  -s ours

Change-Id: I8c67999bc3c5777bbccc06ea3a503625db665dac
2016-08-31 04:05:26 +00:00
Jason Monk
6c0fba6e3f Merge "Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10 am: db2d30e1b9 am: 1a5a746fa3 am: 566f34f617" into nyc-mr1-dev-plus-aosp
am: fe72269d88

Change-Id: I781f061a9eb3f96bfbebd3c1fff02b31393cb6dd
2016-08-31 04:05:16 +00:00
Jason Monk
549a817489 Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10 am: db2d30e1b9 am: 1a5a746fa3 am: 566f34f617
am: 5d5d2a3992

Change-Id: I1a2838cf6d296e84745df1657b9fe06f9d5ce237
2016-08-31 04:05:12 +00:00
Jason Monk
301ff51e84 Merge "Fix double status bar icons am: 12124d7eca am: 447991c67a am: 9570287870 am: 5f3ddc7d6d" into nyc-mr1-dev-plus-aosp
am: 1cc92e1297

Change-Id: I46e97039e930496e5af731c6f03629833d996e11
2016-08-31 04:04:59 +00:00
Jason Monk
fc69fcd4c1 Fix double status bar icons am: 12124d7eca am: 447991c67a am: 9570287870 am: 5f3ddc7d6d
am: 29b285c080

Change-Id: I6c5bd606b62322d0aa0df95888534fcdeb5baa86
2016-08-31 04:04:55 +00:00
Selim Cinek
719d3cad05 Merge "Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677 am: ee8d1394e3" into nyc-mr1-dev-plus-aosp
am: 0a502573fb

Change-Id: Ifb13e4fb6fd8290c7f8cbf505e45d64334d8b959
2016-08-31 04:04:42 +00:00
Selim Cinek
ea0bf496c8 Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677 am: ee8d1394e3
am: ea1b06b0ad

Change-Id: I993be517e322fc22c9f44da66d917825eba98c2d
2016-08-31 04:04:37 +00:00
Selim Cinek
d357f47fae Merge "Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836 am: 169a18d87e" into nyc-mr1-dev-plus-aosp
am: dd5d19e4b5

Change-Id: I2009c935abc6f762b1d2d162831bd0dd309e6fe0
2016-08-31 04:04:22 +00:00
Selim Cinek
6596fb3bdd Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836 am: 169a18d87e
am: 3b1a53290b

Change-Id: I5cb0cead84ce161183881366eb6c2f24582b672f
2016-08-31 04:04:18 +00:00
Selim Cinek
3c1d2874fb Merge "Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0 am: a17beb7869" into nyc-mr1-dev-plus-aosp
am: 6833b79b67

Change-Id: I2d50f975c5bb91de2c2af785c0c74250e9facca1
2016-08-31 03:58:14 +00:00
Selim Cinek
ceb61aa4e7 Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0 am: a17beb7869
am: 2d3872ee0f

Change-Id: I87886fa55dca4bd9050f0d7c33faf2c8b96c6b86
2016-08-31 03:58:11 +00:00
Vineeta Srivastava
b8399e445e Merge "Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5" into nyc-mr1-dev-plus-aosp
am: b6533c3207

Change-Id: Ic5354cf764424754964a3b75f272145602f2c8d0
2016-08-31 03:58:01 +00:00
Vineeta Srivastava
1afd7a7abe Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5
am: 8b42909e46

Change-Id: I07ac16e04c78546b3ea619d02490f3963e4e620b
2016-08-31 03:57:56 +00:00
Vineeta Srivastava
4463996b71 Merge "whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94 am: f4be3d2927 am: 30c49a0a1b -s ours" into nyc-mr1-dev-plus-aosp
am: 34ce85f36e

Change-Id: Idf389b93b02edee4b9f573a227f776d4039c8f92
2016-08-31 03:57:41 +00:00
Vineeta Srivastava
bdf31dfd20 whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94 am: f4be3d2927 am: 30c49a0a1b -s ours
am: f7cca24d9d

Change-Id: I3f99a1c8a88fb3b2a689043f74c9789a2fe77124
2016-08-31 03:57:37 +00:00
Todd Kennedy
fae7e84ace Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d am: 30a8917720
am: 0a1647d8ee

Change-Id: I8023ef52245f08ff778783255ed1a80683101640
2016-08-31 03:57:22 +00:00
Todd Kennedy
bdfe686892 update shared libraries for system apps am: 85a91def5c am: caf42418f6
am: 69c771bb67

Change-Id: I739bb9f94631f155da378f9ecbf15db7e82a6199
2016-08-31 03:57:16 +00:00
Mitchell Wills
2747073b88 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
am: 722de5f9d0  -s ours

Change-Id: Ic63cc762aa0a73af972539e5d08ef5a691babff7
2016-08-31 03:47:37 +00:00
John Reck
9724aa0536 Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 8f0de55375
am: a6a95328dd

Change-Id: I2c7bde569f077f21125927dc66d5aa2e8b41fe81
2016-08-31 03:47:33 +00:00
Chris Craik
2cf413dc2f Cherry pick TextureView fixes am: 2e8a8a2432 am: dbf69818a2
am: 8f64067da7

Change-Id: I498cdcd0be1f3a4843a2995d364bc619277fb2e0
2016-08-31 03:47:30 +00:00
Yohei Yukawa
a3535f688c Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41 am: 438c37a1dc
am: 05d01dc73c

Change-Id: Id2ff66326aff43b5f27eb4a3d44d051d5dab6ab3
2016-08-31 03:47:25 +00:00
Yohei Yukawa
5ae721e8da Make sure IME focus is synced to View focus am: 8eb07090a4 am: 87b9a88c32 -s ours
am: 824155f77a

Change-Id: I363ccee5ffa66c1f3517102ae2fb44fd27d32d55
2016-08-31 03:47:21 +00:00
Felipe Leme
deaeef0bc0 Merge "Adds a section for unaccounted data." into nyc-mr1-dev am: 63ee361d4e
am: f89827b1d9

Change-Id: I4ed7f8e9f3b487f2f7b64a71a23af61b88689ed0
2016-08-31 03:39:58 +00:00
Chet Haase
a374be8e38 Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb472858 am: db7f35fed6
am: 2bcd492ca4

Change-Id: I0df6967d261e2ac8406181882055a1daa8f76c67
2016-08-31 03:37:16 +00:00
Yuichi Biwa
0aa1461417 ChooserActivity: Cannot start app that the icon overflows the layout am: cb3e1237b5 am: 98a824dbb7
am: 5e7c2b96b0

Change-Id: Ib3f67b4658657691007fb1e64222c96cee7ade64
2016-08-31 03:37:12 +00:00
Chet Haase
73cf6f9192 Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c am: c562501eb1
am: 498860a688

Change-Id: I9c7912b60f3b7ffde5a321b5913d0ffabf1a3054
2016-08-31 03:37:08 +00:00
Alan Viverette
d3ac58f9ee Set up view state before attaching, jump drawables if needed am: c328f042a6 am: 01ba422091 -s ours
am: 586e59e661

Change-Id: I84e482ada6bf088fba43f7baacc67e6eb834cc85
2016-08-31 03:37:05 +00:00
Chet Haase
e150a0b25a Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am: a1bbb76806 am: df46861131
am: 47b0ecd20f

Change-Id: Ib42474a76db7d254078f59f27be7b4081b54335b
2016-08-31 03:37:02 +00:00
Adam Powell
92e88be9cd Force AlertDialogLayout to have gravity start|top am: 00c4f7ba65 am: 426750d9c6
am: 465347132b

Change-Id: I071d23678a8acd5a6e073fa8636a13a99afcbfce
2016-08-31 03:31:59 +00:00
Chet Haase
f3e0cbbed0 Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am: c80a4d7ae3 am: 55c66ce844
am: 17677c85a0

Change-Id: Icd81bdd46f8927e3447a03dc2443e323884df17b
2016-08-31 03:31:55 +00:00
Abodunrinwa Toki
9df580f2af FloatingActionMode: Fix screen coordinates. am: 99c340cad9 am: 6507b8b333
am: 7886d0d6ee

Change-Id: I3cf532f5f4144c8e3ecb2e49bc110eb83e0dc718
2016-08-31 03:31:51 +00:00
Christopher Tate
748d7c448e Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062 am: ea14c09012
am: fed21a73d2

Change-Id: Idd5959cab13d27697e90ebb622e9b2531b953ee3
2016-08-31 03:31:47 +00:00
Christopher Tate
8b1d00d2a3 Eliminate next-alarm-clock broadcast flapping am: c60da1edc1 am: b593999965
am: 2648a12325

Change-Id: Ia6615699929df0182931492ebeada88bd84e41bb
2016-08-31 03:31:44 +00:00
Felipe Leme
5c09e77b77 Adds a section for unaccounted data. am: 54dc9edc52
am: e2e58543a0

Change-Id: I8b72d482eb3d635a9feb5282865640c4653dd653
2016-08-31 03:21:51 +00:00
Andrii Kulian
d05a7ffdee Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed am: bdbf13e989
am: 3c0dd6392c  -s ours

Change-Id: Ic7e05e2e8f36d0ffbb8765ccb6bd617c02cf4f78
2016-08-31 03:17:59 +00:00