OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: d40a9f4c4e
Mark Lu [Mon, 26 Sep 2016 17:44:13 +0000 (17:44 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: d40a9f4c4e
am: 0f31433733

Change-Id: I708841e8ef53a99f113fff2d1d1fb0536190499f

7 years agoFixed a typo in the code sample am: 247d1c9ea8 am: 6a400a5190
Hemal Patel [Mon, 26 Sep 2016 17:43:27 +0000 (17:43 +0000)]
Fixed a typo in the code sample am: 247d1c9ea8 am: 6a400a5190
am: f6356ef3f6

Change-Id: I04a154eeb1bcfdcc5ccfb934880df5bf2b10af41

7 years agoMerge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3
Mark Lu [Mon, 26 Sep 2016 17:30:14 +0000 (17:30 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3
am: d40a9f4c4e

Change-Id: Iadfc78dac99cdedd3217d9d60da9be06dcfafef1

7 years agoMerge "Change data usage alert/disabled messages." into nyc-mr1-dev
Tyler Gunn [Mon, 26 Sep 2016 17:30:14 +0000 (17:30 +0000)]
Merge "Change data usage alert/disabled messages." into nyc-mr1-dev
am: 29678c0357

Change-Id: I8eee735e7cbd13a5c05e456c01f92aac43046e8c

7 years agoChange data usage alert/disabled messages.
Tyler Gunn [Mon, 26 Sep 2016 17:30:04 +0000 (17:30 +0000)]
Change data usage alert/disabled messages.
am: 65ed8f9512

Change-Id: I3344dfbb64efad0a920e846a8e0de28fc1059074

7 years agoFixed a typo in the code sample am: 247d1c9ea8
Hemal Patel [Mon, 26 Sep 2016 17:29:02 +0000 (17:29 +0000)]
Fixed a typo in the code sample am: 247d1c9ea8
am: 6a400a5190

Change-Id: Idbf5c554ac863e7c2024816ad726d6e6c8cb9d2f

7 years agoMerge "Change data usage alert/disabled messages." into nyc-mr1-dev
Tyler Gunn [Mon, 26 Sep 2016 17:26:18 +0000 (17:26 +0000)]
Merge "Change data usage alert/disabled messages." into nyc-mr1-dev

7 years agoMerge "Fixed a typo in the code sample" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:21:04 +0000 (17:21 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev
am: 537481e2c3

Change-Id: I266099fbc1102a5accd1080638745924718ec6fc

7 years agoMerge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev
Michael Wright [Mon, 26 Sep 2016 17:21:04 +0000 (17:21 +0000)]
Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev
am: 99ff7405a3

Change-Id: I54c98d84d90a7317d949cefc898f7bdf92649c86

7 years agoFixed a typo in the code sample
Hemal Patel [Mon, 26 Sep 2016 17:21:00 +0000 (17:21 +0000)]
Fixed a typo in the code sample
am: 247d1c9ea8

Change-Id: I2f004e4900ed39d6564e0c3947f27fa79eac2266

7 years agoDisable battery saver when booting with sufficient battery
Michael Wright [Mon, 26 Sep 2016 17:21:00 +0000 (17:21 +0000)]
Disable battery saver when booting with sufficient battery
am: 2763c2ba6c

Change-Id: I7b94bc0ce1c370d456cc9275aa1067929d4d95d0

7 years agoMerge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev
TreeHugger Robot [Mon, 26 Sep 2016 17:14:16 +0000 (17:14 +0000)]
Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev

7 years agoMerge "Fixed a typo in the code sample" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev

7 years agoMerge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce
Josh Horwich [Mon, 26 Sep 2016 15:44:42 +0000 (15:44 +0000)]
Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce
am: 5ca7164e54

Change-Id: I9aac3d3819aed289b9f6b24a2609dc69c4c178a1

7 years agoDocs: Fix missing space am: 999fe148e4 am: 0413b48aba
Josh Horwich [Mon, 26 Sep 2016 15:43:42 +0000 (15:43 +0000)]
Docs: Fix missing space am: 999fe148e4 am: 0413b48aba
am: 0f895d3d9c

Change-Id: I90245f5815502f4e53609f8458537336101caf55

7 years agoMerge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev
Michael Wright [Mon, 26 Sep 2016 15:42:53 +0000 (15:42 +0000)]
Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev
am: 6f1b29ef67

Change-Id: Id8dd0eb4d799fa059e811c48027048ad27650559

7 years agoMerge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa
Josh Horwich [Mon, 26 Sep 2016 15:37:39 +0000 (15:37 +0000)]
Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa
am: 70399b36ce

Change-Id: I92ab3a5beee114aa0b325f831d87dd6e2abc96f5

7 years agoDocs: Fix missing space am: 999fe148e4
Josh Horwich [Mon, 26 Sep 2016 15:36:46 +0000 (15:36 +0000)]
Docs: Fix missing space am: 999fe148e4
am: 0413b48aba

Change-Id: I701120ce04f3b5a4dfbb8ebb4dc4b348970ba4e7

7 years agoDO NOT MERGE Track generics in API definition.
Michael Wright [Mon, 26 Sep 2016 15:35:28 +0000 (15:35 +0000)]
DO NOT MERGE Track generics in API definition.
am: 62b7f8bf7c

Change-Id: I02d32857ebdc9316d19a35bc253555e73b54c9bb

7 years agoMerge "Docs: Fix missing space" into nyc-dev
Josh Horwich [Mon, 26 Sep 2016 15:31:45 +0000 (15:31 +0000)]
Merge "Docs: Fix missing space" into nyc-dev
am: fd0a31c0aa

Change-Id: Ib888812a14fde7497d2979224b44053c7b78d694

7 years agoDocs: Fix missing space
Josh Horwich [Mon, 26 Sep 2016 15:31:42 +0000 (15:31 +0000)]
Docs: Fix missing space
am: 999fe148e4

Change-Id: I2b68e855bcb9e3f76d8cf04c93097a265b03d13d

7 years agoMerge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev
TreeHugger Robot [Mon, 26 Sep 2016 15:29:14 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev

7 years agoMerge "Docs: Fix missing space" into nyc-dev
TreeHugger Robot [Mon, 26 Sep 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Docs: Fix missing space" into nyc-dev

7 years agoMerge "Add count of WebView instances to meminfo" into nyc-mr1-dev
Richard Uhler [Mon, 26 Sep 2016 14:38:40 +0000 (14:38 +0000)]
Merge "Add count of WebView instances to meminfo" into nyc-mr1-dev
am: b0216412a2

Change-Id: Ic9095caa0f21be5902900d9cf3f62accbb41b232

7 years agoAdd count of WebView instances to meminfo
Richard Uhler [Mon, 26 Sep 2016 14:38:38 +0000 (14:38 +0000)]
Add count of WebView instances to meminfo
am: 2c0361986b

Change-Id: I6b33039e70a20e7aaf0613081e8e64ee7e56873a

7 years agoMerge "Add count of WebView instances to meminfo" into nyc-mr1-dev
TreeHugger Robot [Mon, 26 Sep 2016 14:33:23 +0000 (14:33 +0000)]
Merge "Add count of WebView instances to meminfo" into nyc-mr1-dev

7 years agoMerge "Show PLMN on CryptKeeper" into nyc-mr1-dev
Adrian Roos [Sat, 24 Sep 2016 02:07:40 +0000 (02:07 +0000)]
Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev
am: c3fddb984c

Change-Id: Ibf53419b03256edbcd24805151474a14caac4e38

7 years agoShow PLMN on CryptKeeper
Adrian Roos [Sat, 24 Sep 2016 02:07:38 +0000 (02:07 +0000)]
Show PLMN on CryptKeeper
am: 316bf54484

Change-Id: Ia1e078cca8e29aa0f36b46daf74ce91ec1a90f48

7 years agoMerge "Show PLMN on CryptKeeper" into nyc-mr1-dev
TreeHugger Robot [Sat, 24 Sep 2016 01:58:52 +0000 (01:58 +0000)]
Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev

7 years agoMerge "Adding compatibility note for drag/drop in N." into nyc-mr1-dev
Vadim Tryshev [Sat, 24 Sep 2016 01:20:07 +0000 (01:20 +0000)]
Merge "Adding compatibility note for drag/drop in N." into nyc-mr1-dev
am: 6b4a9f6d54

Change-Id: I76df9c8d6d51dd86bc04a3e7bf1bda122ec864a3

7 years agoAdding compatibility note for drag/drop in N.
Vadim Tryshev [Sat, 24 Sep 2016 01:20:05 +0000 (01:20 +0000)]
Adding compatibility note for drag/drop in N.
am: 06b9b60c6d

Change-Id: I760d8c57492f72e4df85fa14351bf10b836c396a

7 years agoMerge "Adding compatibility note for drag/drop in N." into nyc-mr1-dev
TreeHugger Robot [Sat, 24 Sep 2016 01:07:21 +0000 (01:07 +0000)]
Merge "Adding compatibility note for drag/drop in N." into nyc-mr1-dev

7 years agoShow PLMN on CryptKeeper
Adrian Roos [Tue, 23 Aug 2016 15:53:07 +0000 (17:53 +0200)]
Show PLMN on CryptKeeper

Also shows the state only once radio is enabled.

Fixes: 30301831
Change-Id: Iaf3b96c3622e20d8ada6e1f6391d6065101fb281

7 years agoMerge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev
Daniel Nishi [Sat, 24 Sep 2016 00:20:30 +0000 (00:20 +0000)]
Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev
am: 83479600cb

Change-Id: I31c98396c146bfbca1f7a6758abe63ece8cd929d

7 years agoAdd a hidden action to trigger the storage manager settings.
Daniel Nishi [Sat, 24 Sep 2016 00:20:23 +0000 (00:20 +0000)]
Add a hidden action to trigger the storage manager settings.
am: 4bd88df1fb

Change-Id: Iad3223793afb9ee0fe3de65baf91373160f163a9

7 years agoMerge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev
Daniel Nishi [Sat, 24 Sep 2016 00:15:49 +0000 (00:15 +0000)]
Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev

7 years agoMerge "Update/correct Drag and Drop docs." into nyc-mr1-dev
Vadim Tryshev [Fri, 23 Sep 2016 23:33:44 +0000 (23:33 +0000)]
Merge "Update/correct Drag and Drop docs." into nyc-mr1-dev
am: 1bc452b5a5

Change-Id: I6c3cb4e6c7e955534d46f956f4b6b96f0a8479ef

7 years agoUpdate/correct Drag and Drop docs.
Vadim Tryshev [Fri, 23 Sep 2016 23:33:42 +0000 (23:33 +0000)]
Update/correct Drag and Drop docs.
am: c5109b3f6e

Change-Id: I6b64deb63cfdf6a2afac41cb819fb163b76f8849

7 years agoMerge "Update/correct Drag and Drop docs." into nyc-mr1-dev
TreeHugger Robot [Fri, 23 Sep 2016 23:23:18 +0000 (23:23 +0000)]
Merge "Update/correct Drag and Drop docs." into nyc-mr1-dev

7 years agoMerge "docs: update javadoc description for View.setVisibility() method" into nyc...
Mark Lu [Fri, 23 Sep 2016 22:39:34 +0000 (22:39 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: f2f2d48a0e
am: aaac8120d0

Change-Id: I85e337fb5a7ccdf8ae15c81ac1864d868d76b2e0

7 years agodocs: update javadoc description for View.setVisibility() method am: ae0459f532 am...
Mark Lu [Fri, 23 Sep 2016 22:38:46 +0000 (22:38 +0000)]
docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 66192078c5
am: 357dfd039a

Change-Id: I4d8ec3cb3e31e17e2f5787fb940f96e5768deb72

7 years agoMerge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am...
Mark Lu [Fri, 23 Sep 2016 22:37:50 +0000 (22:37 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 83e283b22f
am: 0b18f94cbc

Change-Id: I6f81a3e9fe2e5f5efe6b47486f84a8816c0c39ba

7 years agodocs: update docs for uses-feature element am: b463a6db08 am: a6f0c7f99f
Mark Lu [Fri, 23 Sep 2016 22:36:57 +0000 (22:36 +0000)]
docs: update docs for uses-feature element am: b463a6db08 am: a6f0c7f99f
am: 5344c7df8f

Change-Id: I829a23341e1e69bc67d35583a9ac9aca463b3e2f

7 years agoMerge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691...
Mark Lu [Fri, 23 Sep 2016 22:36:03 +0000 (22:36 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: f5eeb28a42
am: 362db8e6a5

Change-Id: Icd93c9fc5df51037186197075333f8415ca603b3

7 years agodocs: Add param info to TextView.setTextColor am: 193879a8b6 am: 544e899559
Mark Lu [Fri, 23 Sep 2016 22:34:56 +0000 (22:34 +0000)]
docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 544e899559
am: d1bb5fad4e

Change-Id: Ib01e3a74299eb61fe8e0e85d08a0b9963eeacad1

7 years agoAdding compatibility note for drag/drop in N.
Vadim Tryshev [Fri, 23 Sep 2016 22:32:33 +0000 (15:32 -0700)]
Adding compatibility note for drag/drop in N.

Bug: 31702571
Change-Id: Ib4b839eec21ea8e1c2b3686595a45642eb8285ba

7 years agoMerge "docs: update javadoc description for View.setVisibility() method" into nyc...
Mark Lu [Fri, 23 Sep 2016 22:29:34 +0000 (22:29 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c
am: f2f2d48a0e

Change-Id: I8f9eb23b0ef604fbdacf256e05832355fc813218

7 years agodocs: update javadoc description for View.setVisibility() method am: ae0459f532
Mark Lu [Fri, 23 Sep 2016 22:28:41 +0000 (22:28 +0000)]
docs: update javadoc description for View.setVisibility() method am: ae0459f532
am: 66192078c5

Change-Id: I7f3775c5fd9e63252cea9fafb8ed4b79c95bfcba

7 years agoMerge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3
Mark Lu [Fri, 23 Sep 2016 22:27:50 +0000 (22:27 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3
am: 83e283b22f

Change-Id: I00c39e0c329dda6ab66820d3a858f5daeecdb6c7

7 years agodocs: update docs for uses-feature element am: b463a6db08
Mark Lu [Fri, 23 Sep 2016 22:27:02 +0000 (22:27 +0000)]
docs: update docs for uses-feature element am: b463a6db08
am: a6f0c7f99f

Change-Id: I3eab318c16f240fe9787fdd2c6e750ddfa8343b1

7 years agoMerge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691
Mark Lu [Fri, 23 Sep 2016 22:26:05 +0000 (22:26 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691
am: f5eeb28a42

Change-Id: Icce28df30d250c752e5605d3ced3a7f904a904a8

7 years agodocs: Add param info to TextView.setTextColor am: 193879a8b6
Mark Lu [Fri, 23 Sep 2016 22:25:17 +0000 (22:25 +0000)]
docs: Add param info to TextView.setTextColor am: 193879a8b6
am: 544e899559

Change-Id: Ic4506ceaf5c34c93b3d937137f9a4756508ff189

7 years agoMerge "Fix wake lock logic during Dream startup" into nyc-mr1-dev
Adrian Roos [Fri, 23 Sep 2016 22:20:00 +0000 (22:20 +0000)]
Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev
am: 27eb169db0

Change-Id: I169706cac13e20f21c2cdf42156f32095f3a107b

7 years agoFix wake lock logic during Dream startup
Adrian Roos [Fri, 23 Sep 2016 22:19:57 +0000 (22:19 +0000)]
Fix wake lock logic during Dream startup
am: 9ede1d2602

Change-Id: If4bbf9e3242946a352eedbba3d8610964b505c29

7 years agoMerge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:19:50 +0000 (22:19 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
am: d91c303e6c

Change-Id: I63e930d5d3e0e6da2af44a62d2e4f781719b4028

7 years agodocs: update javadoc description for View.setVisibility() method
Mark Lu [Fri, 23 Sep 2016 22:19:47 +0000 (22:19 +0000)]
docs: update javadoc description for View.setVisibility() method
am: ae0459f532

Change-Id: Ie217e46288a11e86b2e5b6e56d8ce5cb2a214861

7 years agoMerge "docs: update docs for uses-feature element" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:18:20 +0000 (22:18 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev
am: dc24613bf3

Change-Id: I9ea4800646bbe165551d6782beb6cc337ffa7055

7 years agodocs: update docs for uses-feature element
Mark Lu [Fri, 23 Sep 2016 22:18:17 +0000 (22:18 +0000)]
docs: update docs for uses-feature element
am: b463a6db08

Change-Id: I51394b88aec2716551ddfe329bf9a9726e156739

7 years agoMerge "docs: Add param info to TextView.setTextColor" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:16:40 +0000 (22:16 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
am: 7df8927691

Change-Id: Ibcb55559a05d383182870e5f38fe9432e22cf526

7 years agodocs: Add param info to TextView.setTextColor
Mark Lu [Fri, 23 Sep 2016 22:16:37 +0000 (22:16 +0000)]
docs: Add param info to TextView.setTextColor
am: 193879a8b6

Change-Id: I5b157858dd056b2510486ad7546ab74e1287005c

7 years agoMerge "Fix wake lock logic during Dream startup" into nyc-mr1-dev
Adrian Roos [Fri, 23 Sep 2016 22:13:54 +0000 (22:13 +0000)]
Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev

7 years agoFix wake lock logic during Dream startup
Adrian Roos [Fri, 23 Sep 2016 21:08:09 +0000 (14:08 -0700)]
Fix wake lock logic during Dream startup

Fixes a crash that would happen in all dreams
that did not have permission to acquire wake locks.
Instead moves the wake lock logic into the system
process. Also fixes a bug in DozeService where the
wake lock was not held until dozing was actually
properly initialized.

Fixes: 31612287
Bug: 31044352
Related-CL: I85955a2b7d6bad5171accbc336117a9660b1b198
Test: adb shell settings put secure screensaver_components com.android.dreams.basic/.Colors; adb shell service call dreams 1

Change-Id: Idb3f921ee71b6da6c2ab0c44c332ef91f93ddbc0

7 years agoMerge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:36 +0000 (22:10 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev

7 years agoMerge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev...
Mark Lu [Fri, 23 Sep 2016 22:10:25 +0000 (22:10 +0000)]
Merge "docs:  Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 95ca35f4ff
am: 824fc38439

Change-Id: I173b8bce5f155065179806f8013ba0879f3beee5

7 years agoMerge "docs: update docs for uses-feature element" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:19 +0000 (22:10 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev

7 years agodocs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am...
Mark Lu [Fri, 23 Sep 2016 22:09:35 +0000 (22:09 +0000)]
docs:  Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am: 902fb28784
am: a744c8c25a

Change-Id: I401a87f3d1a013e61e0d5a65797ce7dc1b58162d

7 years agoMerge "docs: Add param info to TextView.setTextColor" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:09:31 +0000 (22:09 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev

7 years agoMerge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev
Selim Cinek [Fri, 23 Sep 2016 22:05:24 +0000 (22:05 +0000)]
Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev
am: 7f53b9bcb5

Change-Id: Ibaa6083c367cb1bac177a038573b748204300548

7 years agoFix DismissView cannot be clicked sometimes after boot
Dong-wan Kim [Fri, 23 Sep 2016 22:05:21 +0000 (22:05 +0000)]
Fix DismissView cannot be clicked sometimes after boot
am: b926666a76

Change-Id: I1f9a91b04dfc7b1bbaff3243e383c6b26dd4dcf4

7 years agoFix RTL issue of ImageFloatingTextView
dongwan0605.kim [Fri, 23 Sep 2016 22:04:42 +0000 (22:04 +0000)]
Fix RTL issue of ImageFloatingTextView
am: dd8611fc5a

Change-Id: I101527b922604640fef684c6216b99289ac97f25

7 years agoMerge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev
Selim Cinek [Fri, 23 Sep 2016 22:02:20 +0000 (22:02 +0000)]
Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev
am: a05719a278

Change-Id: I9ec03aad7067080423e27ab8158e82ba103c1a15

7 years agoFixed a bug where the dimmed background could be invisible
Selim Cinek [Fri, 23 Sep 2016 22:02:16 +0000 (22:02 +0000)]
Fixed a bug where the dimmed background could be invisible
am: 3334a182a6

Change-Id: I30cfda47616d2b365113d9d05f7483e239b973e1

7 years agoFixed an issue where the inline controls where not usable
Selim Cinek [Fri, 23 Sep 2016 22:01:22 +0000 (22:01 +0000)]
Fixed an issue where the inline controls where not usable
am: fc7086ef65

Change-Id: I802f032cbe63c19e28782ece7a7a9d6faa1665b6

7 years agoAdded Emergency affordance feature
Selim Cinek [Fri, 23 Sep 2016 22:00:42 +0000 (22:00 +0000)]
Added Emergency affordance feature
am: 705442fa7d

Change-Id: I03ebb84119f9cb310882ba9ea90ee1e1d7118d03

7 years agoMerge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev...
Mark Lu [Fri, 23 Sep 2016 21:59:28 +0000 (21:59 +0000)]
Merge "docs:  Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40
am: 95ca35f4ff

Change-Id: I6cbf5d6bd0881c51ea5f730550c6b5708e6bcdb3

7 years agodocs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc
Mark Lu [Fri, 23 Sep 2016 21:58:21 +0000 (21:58 +0000)]
docs:  Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc
am: 902fb28784

Change-Id: I67ad867bdad8634437fe6779e027001355bbc6ae

7 years agoMerge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 21:52:32 +0000 (21:52 +0000)]
Merge "docs:  Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
am: c6a1076e40

Change-Id: Iafe629eba6bb9e7d2c6373ef1ffa78b52cac709f

7 years agodocs: Mention SwitchCompat in Switch and toggle documentation
Mark Lu [Fri, 23 Sep 2016 21:52:30 +0000 (21:52 +0000)]
docs:  Mention SwitchCompat in Switch and toggle documentation
am: 3404032dfc

Change-Id: I1df8dd7f48f095a93aaff120b0f86e2ccc6467fd

7 years agoMerge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev
Selim Cinek [Fri, 23 Sep 2016 21:52:10 +0000 (21:52 +0000)]
Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev

* changes:
  Fix DismissView cannot be clicked sometimes after boot
  Fix RTL issue of ImageFloatingTextView

7 years agoMerge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev
Selim Cinek [Fri, 23 Sep 2016 21:51:19 +0000 (21:51 +0000)]
Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev

* changes:
  Fixed a bug where the dimmed background could be invisible
  Fixed an issue where the inline controls where not usable
  Added Emergency affordance feature

7 years agoMerge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 21:47:27 +0000 (21:47 +0000)]
Merge "docs:  Mention SwitchCompat in Switch and toggle documentation" into nyc-dev

7 years agoMerge "docs: Removed two images that were moved to Piper in April" into nyc-dev am...
Andrew Solovay [Fri, 23 Sep 2016 21:36:11 +0000 (21:36 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev am: ddcf2deb14 am: 4e7bb2a653
am: caa71ddd02

Change-Id: I0590b6738155398a57e3292912090c24b1c3edc3

7 years agodocs: Removed two images that were moved to Piper in April am: f955d4cd9f am: 430cac7c81
Andrew Solovay [Fri, 23 Sep 2016 21:35:21 +0000 (21:35 +0000)]
docs: Removed two images that were moved to Piper in April am: f955d4cd9f am: 430cac7c81
am: f4e2f65117

Change-Id: Id29123cc05c72e054efe0c5f1e04a1177a77dd57

7 years agoMerge "docs: Removed two images that were moved to Piper in April" into nyc-dev am...
Andrew Solovay [Fri, 23 Sep 2016 21:31:44 +0000 (21:31 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev am: ddcf2deb14
am: 4e7bb2a653

Change-Id: I4e6dba245eb10b47f9e342c99e5de4d904cbe834

7 years agodocs: Removed two images that were moved to Piper in April am: f955d4cd9f
Andrew Solovay [Fri, 23 Sep 2016 21:30:53 +0000 (21:30 +0000)]
docs: Removed two images that were moved to Piper in April am: f955d4cd9f
am: 430cac7c81

Change-Id: I57500df20a59797b4d03143c5272ee1ffb99db10

7 years agoMerge "docs: Removed two images that were moved to Piper in April" into nyc-dev
Andrew Solovay [Fri, 23 Sep 2016 21:25:22 +0000 (21:25 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev
am: ddcf2deb14

Change-Id: Ic467b0a3389dbb8e1428f301a2e842d427134720

7 years agodocs: Removed two images that were moved to Piper in April
Andrew Solovay [Fri, 23 Sep 2016 21:25:21 +0000 (21:25 +0000)]
docs: Removed two images that were moved to Piper in April
am: f955d4cd9f

Change-Id: I9d4d814b765539b5dec691bddadfb6658d1c976f

7 years agoMerge "docs: Removed two images that were moved to Piper in April" into nyc-dev
Andrew Solovay [Fri, 23 Sep 2016 21:15:28 +0000 (21:15 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev

7 years agoMerge "ResolverComparator transitivity" into nyc-mr1-dev
Adam Powell [Fri, 23 Sep 2016 20:39:51 +0000 (20:39 +0000)]
Merge "ResolverComparator transitivity" into nyc-mr1-dev
am: df7f4a13d7

Change-Id: I54c0a31983fc330dd2aa235e15a7aa5ed432d0c5

7 years agoResolverComparator transitivity
Adam Powell [Fri, 23 Sep 2016 20:39:49 +0000 (20:39 +0000)]
ResolverComparator transitivity
am: 2366ff12a2

Change-Id: I8de9805eab7617a952579ff0c82616c0923e5513

7 years agoMerge "ResolverComparator transitivity" into nyc-mr1-dev
TreeHugger Robot [Fri, 23 Sep 2016 20:33:52 +0000 (20:33 +0000)]
Merge "ResolverComparator transitivity" into nyc-mr1-dev

7 years agoMerge "Extract action icons for Wear adjusted for optical alignment" into cw-f-dev
Mark Renouf [Fri, 23 Sep 2016 20:32:35 +0000 (20:32 +0000)]
Merge "Extract action icons for Wear adjusted for optical alignment" into cw-f-dev

7 years agoMerge "Updated summary logic for wifi" into nyc-mr1-dev
Salvador Martinez [Fri, 23 Sep 2016 20:30:52 +0000 (20:30 +0000)]
Merge "Updated summary logic for wifi" into nyc-mr1-dev
am: dd685cac26

Change-Id: Id93b7723b55f3e908c935c3aba9185e6cb78eb2a

7 years agoUpdated summary logic for wifi
Salvador Martinez [Fri, 23 Sep 2016 20:30:49 +0000 (20:30 +0000)]
Updated summary logic for wifi
am: 5d937fc95f

Change-Id: I20c55b4af7ecd658b7690e1597389bc9a679c573

7 years agoMerge "Updated summary logic for wifi" into nyc-mr1-dev
Salvador Martinez [Fri, 23 Sep 2016 20:24:11 +0000 (20:24 +0000)]
Merge "Updated summary logic for wifi" into nyc-mr1-dev

7 years agoFix DismissView cannot be clicked sometimes after boot
Dong-wan Kim [Wed, 21 Sep 2016 20:08:30 +0000 (13:08 -0700)]
Fix DismissView cannot be clicked sometimes after boot

mActivePointerId should be initialized to INVALID_POINTER.
Otherwise, the click event to DismissView can be intercepted by
onInterceptTouchEventScroll() due to wrong calculated value of yDiff
when mActivePointerId is not intialized.

This issue can be reproduced at the first click to DismissView while
user have not touched any notification views ever after boot.
And that click event must contains some MOVE events.

Test: manual - Check whether user always can click DismissView
               after boot.
Fixes: 31649735
Change-Id: If9baf6db1b891a58e17153806d52d395ddd661df

7 years agoFix RTL issue of ImageFloatingTextView
dongwan0605.kim [Fri, 16 Sep 2016 07:26:57 +0000 (16:26 +0900)]
Fix RTL issue of ImageFloatingTextView

Sometimes, makeSingleLayout() can be invoked before layout direction is resolved.
When not resolved, it indents in LTR layout although it should be RTL.

So, to guarantee the exact indenting, we should re-build the text layout
when the layout direction is changed.

Test: manual - Test BigTextStyle notifications with LargeIcon under RTL configurations.
Fixes: 31633875
Change-Id: Idc6c5d7d41632cb9e1b70d9c67c13852e3f25023

7 years agoMerge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev
Jason Monk [Fri, 23 Sep 2016 20:02:52 +0000 (20:02 +0000)]
Merge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev
am: 31bc1f5ecf

Change-Id: I823dad1d3cad8e231a4196e40fb677b06641c97b

7 years agoQS: Don't show graph or warning text when not present
Jason Monk [Fri, 23 Sep 2016 20:02:49 +0000 (20:02 +0000)]
QS: Don't show graph or warning text when not present
am: a03c641c60

Change-Id: I998f80d700d9dc726c001587d06b19158c8980b7

7 years agoMerge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev
TreeHugger Robot [Fri, 23 Sep 2016 19:52:37 +0000 (19:52 +0000)]
Merge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev