Commit Graph

65558 Commits

Author SHA1 Message Date
Jorim Jaggi
3c45bc6fde Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662
am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc
2016-04-28 20:38:32 +00:00
Jorim Jaggi
1ef9359662 Merge "Remove optimization to report config change" into nyc-dev
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: Ida68bae850d55f3feb59c596bdef3e5d48e67b77
2016-04-28 20:32:52 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Joe LaPenna
68bc1cc30c Merge "Allow "disk reads" to sysfs in battery stats" 2016-04-28 20:23:50 +00:00
Makoto Onuki
5cc48412b2 Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548 am: 07f8d94c6e
am: a1bca975ef

* commit 'a1bca975efce3830d3c97a98db785151daeda465':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Ib8af31efc5117528d2599fa03bd5ed74f6606fe7
2016-04-28 20:20:53 +00:00
Makoto Onuki
a1bca975ef Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548
am: 07f8d94c6e

* commit '07f8d94c6e53cfd7dd389027fc2471ce5ea07846':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Id5755e333af7552537ddf02c07f0ef12d998b427
2016-04-28 20:18:34 +00:00
Makoto Onuki
16d4eadbd9 Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev
am: d1c30db548

* commit 'd1c30db548da90d5bc092821c6fee4b4ef060bbb':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: I798a064e17a628999568a3a68634318ff1126bf4
2016-04-28 20:16:15 +00:00
Makoto Onuki
d1c30db548 Merge "ShortcutManager: When app's data is cleared, remove all shortcuts," into nyc-dev 2016-04-28 20:11:06 +00:00
Jeff Sharkey
23d8cb4a25 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be
2016-04-28 19:33:53 +00:00
Jeff Sharkey
c68126587a Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae
am: 35c6f6c70a

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ic288860b8edc814830fce958bbe2b0e93acecd78
2016-04-28 19:25:31 +00:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
2016-04-28 19:24:58 +00:00
Kirill Grouchnikov
9df0846498 Aligning behavior of LinearLayout divider APIs
Consistency for:
* Early return on calling setter with the current state
* Calling setWillNotDraw when divider is configured with drawable
and visible
* Calling requestLayout to trigger a relayout pass

Also fix a bug that wouldn't show end divider when all non-GONE
children have 0 width/height.

Bug: 28398719
Bug: 28404367
Change-Id: I16796c74a52ac4c3041390c75add2ec3c33bea8b
2016-04-28 15:22:47 -04:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00
Makoto Onuki
9ac59d0438 ShortcutManager: When app's data is cleared, remove all shortcuts,
as if it's uninstalled.

Fixes 28196831

Change-Id: I1a410372f9e344a10567b00057fa0770eac9fd76
2016-04-28 10:52:02 -07:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance.
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
2016-04-28 10:51:39 -06:00
Jaewan Kim
ae78aede49 Merge "Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857 am: 6e6a6ee" into nyc-mr1-dev-plus-aosp
am: c2be3ea

* commit 'c2be3ea7cdf0e4ae3f64bec94e937a53bd975094':
  Prevent pinned stack from having extra elevation

Change-Id: I33675b67b7d84eb23ffdec6c9a8e21cd19f3064c
2016-04-28 15:21:24 +00:00
Jaewan Kim
6e6a6ee469 Merge "Prevent pinned stack from having extra elevation" into nyc-dev
am: 0f01857

* commit '0f018570fff044bb68b8009815ae7e5c397d09fd':
  Prevent pinned stack from having extra elevation

Change-Id: If115698ec6168bfced727b7488cc38b833d4618a
2016-04-28 15:13:14 +00:00
Michael Wright
98d75a2cb6 Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: b3324b4
am: e5231fe

* commit 'e5231fed951f0ad24fe58604c56c4177d3d00902':
  Properly parcel HdrCapabilities.

Change-Id: I4b8cd07da559ce0ecef1ac48b6d2f4a58711a859
2016-04-28 15:12:54 +00:00
Jaewan Kim
0f018570ff Merge "Prevent pinned stack from having extra elevation" into nyc-dev 2016-04-28 15:10:03 +00:00
Michael Wright
b3324b4a2e Merge "Properly parcel HdrCapabilities." into nyc-dev
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I768887156c78cca859db6123a2bb184f12295ab0
2016-04-28 15:05:44 +00:00
TreeHugger Robot
5bddeaa9bc Merge "Properly parcel HdrCapabilities." into nyc-dev 2016-04-28 15:01:31 +00:00
Chet Haase
5942619c00 Merge "Document behavior of object references in Animator classes" into nyc-dev am: faa5726 am: 5d9a186
am: c66100f

* commit 'c66100fdc028b794bc47d136dddb451fad349cc3':
  Document behavior of object references in Animator classes

Change-Id: I6e2c252b837d20a1321b38d5012cbe66a690e73f
2016-04-28 14:48:37 +00:00
Chet Haase
5d9a186435 Merge "Document behavior of object references in Animator classes" into nyc-dev
am: faa5726

* commit 'faa572608c7d62b116d3b9c6f28bd7eaddf8dba2':
  Document behavior of object references in Animator classes

Change-Id: Ic57273c1be809c14a642993ac09e203c1fb7247b
2016-04-28 14:41:43 +00:00
Chet Haase
faa572608c Merge "Document behavior of object references in Animator classes" into nyc-dev 2016-04-28 14:33:35 +00:00
Alex Hills
ffb555b039 Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315
am: 76a560c

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f
2016-04-28 13:54:08 +00:00
Alex Hills
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
2016-04-28 13:46:34 +00:00
TreeHugger Robot
9de0f87e97 Merge "Move allowGeneratedReplies to Action" into nyc-dev 2016-04-28 13:41:49 +00:00
Jaewan Kim
880eff6e9b Prevent pinned stack from having extra elevation
Pinned stack doesn't have focus, so there's no need for setting extra
elevation to show shadow for focused case.

This removes extra eleavtion for pinned stack, and improves the PIP
animation quality by preventing extra surface size change
at the end of animation.

Bug: 27364161
Change-Id: Id099a78de48b2e038a69600c94454b5cbfe0628f
2016-04-28 21:20:18 +09:00
Andrei Stingaceanu
2f69c097d9 Merge "Fix ListView losing scroll position" into nyc-dev am: adde076 am: c3176ea
am: 0946a58

* commit '0946a5805c1b4ad6c9782574e2ebfaaf1b27819c':
  Fix ListView losing scroll position

Change-Id: I2f2effa5e276e33311ed40824b292065be71c4ab
2016-04-28 09:32:59 +00:00
Andrei Stingaceanu
c3176ea42b Merge "Fix ListView losing scroll position" into nyc-dev
am: adde076

* commit 'adde076fcba30d1571e985ee36687d3f4300438b':
  Fix ListView losing scroll position

Change-Id: I84c1f81403633d8e6f7c4b4ed95c018004878205
2016-04-28 09:26:36 +00:00
Clara Bayarri
adde076fcb Merge "Fix ListView losing scroll position" into nyc-dev 2016-04-28 09:20:47 +00:00
Martijn Coenen
53e7852f0b Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983
am: bd7a5a1

* commit 'bd7a5a1041ea9e8a4075692cac020fd6374b5bb1':
  Fix API review comments, add remove callback.

Change-Id: I55e8eb1f6ae9308abf90d30bac434fc81ed18c7a
2016-04-28 05:49:29 +00:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
Lorenzo Colitti
f77b381b9b Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594 am: 7146d02
am: c097c93

* commit 'c097c9377e6a7e2f6577dd374dc218ef4f57c2eb':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Iced513171ceb6e3e1c4fea545786e59b8c64b40a
2016-04-28 05:30:58 +00:00
Jorim Jaggi
2f5e3ddf9e Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8 am: 1601067
am: 4398aad

* commit '4398aad9542ff58df6ac2aa38f5e31f18021a306':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib5a88c47ef73b461fb1d09b45e4763b0d6512666
2016-04-28 05:30:56 +00:00
TreeHugger Robot
c097c9377e Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594
am: 7146d02

* commit '7146d02910808367f30c82b7b05d757b47a2bc66':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: I2c0625395528fe4984cd18f5b34981b9ef0e9969
2016-04-28 05:28:03 +00:00
TreeHugger Robot
4398aad954 Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8
am: 1601067

* commit '16010672874c7fbacd248c87a31396f7d8222334':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ifa8fb6f3c0c98a74b959be82a523dd4987a0d9d5
2016-04-28 05:28:00 +00:00
Lorenzo Colitti
40ead811e0 Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7
2016-04-28 05:25:22 +00:00
Jorim Jaggi
c880a803d1 Merge changes Idb555b01,If8acf31b into nyc-dev
am: 831ecc8

* commit '831ecc81f982282bdcc2121c2fa3ece22ac997e0':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib61028c751a31b437fb459bd094c2fedadd40abe
2016-04-28 05:25:19 +00:00
TreeHugger Robot
1d3c59457c Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev 2016-04-28 04:01:11 +00:00
Jorim Jaggi
1793d4769b Remove optimization to report config change
Since activity manager only issues a configuration change when
we are not relaunching the activity, the optimization to suppress
that on the client side is not needed anymore and only leads to
issues where there is a change in smallest_width but we are not
relaunching the activity because the change doesn't cross a size
threshold.

Bug: 28050773
Change-Id: I303c190bd7390363d1030edcdb2913b7c64c666d
2016-04-27 20:59:40 -07:00
Lorenzo Colitti
c5be12e7ac Make isCaptivePortal perform both HTTP and HTTPS probes.
Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
2016-04-28 11:23:10 +09:00
Jorim Jaggi
c875ae74ba Don't move forced resizable info activity to the front
If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64
2016-04-27 19:19:04 -07:00
Dianne Hackborn
b5271598ff Merge "Fix issue #28431297: Crash in system process" into nyc-dev am: 1a2f993 am: 2501220
am: 8aad038

* commit '8aad0386145df5a11cc9140a4b7e8d4588e64aa5':
  Fix issue #28431297: Crash in system process

Change-Id: Ibfe02253fe0a4d4981680e58de4d90422e05c9e0
2016-04-28 01:36:40 +00:00
Christopher Tate
89f543c5f5 Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev am: 0731806 am: 3218e95
am: 77ea251

* commit '77ea25191f96c71c634fb1cc8589f83140a79233':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: Ic386fa6ce64fbbe52b377105891c3904c3f48011
2016-04-28 01:36:01 +00:00
Dianne Hackborn
8aad038614 Merge "Fix issue #28431297: Crash in system process" into nyc-dev am: 1a2f993
am: 2501220

* commit '2501220e1f473752b5eadc663f7486668e9b9fc6':
  Fix issue #28431297: Crash in system process

Change-Id: Icae0787b41e5c47339496e0c08457e331e37162f
2016-04-28 01:22:01 +00:00
Dianne Hackborn
e96bf3ccdd Merge "Fix issue #28431297: Crash in system process" into nyc-dev
am: 1a2f993

* commit '1a2f993ba5a81899500b989683364708025e13a5':
  Fix issue #28431297: Crash in system process

Change-Id: I46aec10a524e6864b414d12bb2a79bc24d8b47ae
2016-04-28 01:16:12 +00:00
Dianne Hackborn
1a2f993ba5 Merge "Fix issue #28431297: Crash in system process" into nyc-dev 2016-04-28 01:07:26 +00:00
Badhri Jagan Sridharan
bc07967a69 Merge "Add low power stats to batteryhistory" into nyc-dev am: 5149abe am: b0ec5e2
am: 90edbf9

* commit '90edbf9a2c5d5eec58643fee9c485b79910b3896':
  Add low power stats to batteryhistory

Change-Id: If3b2f1145ca38e05bf880d6471c1467d195edede
2016-04-28 00:58:08 +00:00