Commit Graph

57623 Commits

Author SHA1 Message Date
Raph Levien
7771760f03 Merge "Apply correct bottom padding to layouts" into nyc-dev
am: 6cfecf4

* commit '6cfecf4dff3d55a98f933fdfd153339275005108':
  Apply correct bottom padding to layouts

Change-Id: I40e5272f1f22e5552a7d83a3e50e699f40102b75
2016-04-06 15:58:16 +00:00
Raph Levien
6cfecf4dff Merge "Apply correct bottom padding to layouts" into nyc-dev 2016-04-06 15:52:56 +00:00
Julia Reynolds
7f713ab1c3 Merge "Documentation update for interruption filters." into nyc-dev
am: fa305fc

* commit 'fa305fcc6ba8f4d95b0ee33bbe8c6d9e371096e1':
  Documentation update for interruption filters.

Change-Id: I980f35331785a31275a7d0bf251cfa1a6fcfc34a
2016-04-06 15:41:13 +00:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
Yohei Yukawa
f650e10a0c Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev
am: 12a52bc

* commit '12a52bc3914ac593eb74f5787de54f3682d7f01d':
  Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling.

Change-Id: I3b807d48681946cbdccb6dc1c15fe5aa02502845
2016-04-06 15:10:36 +00:00
Yohei Yukawa
12a52bc391 Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev 2016-04-06 15:06:57 +00:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters.
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
2016-04-06 10:33:14 -04:00
Benjamin Franz
9c17111358 Merge "Document which APIs are callable on the parent instance" into nyc-dev
am: 4a53c8e

* commit '4a53c8e70253928bf89913cb313de47450d0782f':
  Document which APIs are callable on the parent instance

Change-Id: I4cd3ca078d47bcb6c3f1d34f92224e5c8eb3e05f
2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
2016-04-06 11:59:49 +01:00
Erik Kline
a577a3a29f Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev
am: 3671285

* commit '36712853a9d0b57702ee5b1fd936ff0b9f48c151':
  Make public the registerDefaultNetworkCallback API

Change-Id: I35035f991a45ec700530a83cc9cc89145ebb0bb6
2016-04-06 08:55:52 +00:00
Erik Kline
36712853a9 Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev 2016-04-06 08:51:08 +00:00
Yohei Yukawa
2dbc532429 Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling.
This is a follow up CL to my previous CL [1], which caused a regression
that LatinIME does not correctly initialize its UI when:
  1. Make sure SHOW_IME_WITH_HARD_KEYBOARD is off.
  2. Pair a hardware keyboard.
  3. Reboot.
  4. Make sure the hardware keyboard is paird.
  5. Focus in a text box.
  6. Make sure that LatinIME does not show software keyboard.
  7. Tap the IME switcher and turn of "Show Input Method" toggle.

Previously IMS had called many methods from
IMS#onConfigurationChanged(), which was just replaced with
IMS#restartInput() by my CL [1] then broke some assumptions in LatinIME.
This could also break other IMEs' assumptions as well.

To avoid unexpected regressions between M and N like this, this CL
ensures that those methods are called as we have done until [1].

 [1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
      7b739a802c

Bug: 26985193
Change-Id: Iebd98f26d388b64cb318ac202b3bcdd956bd3a27
2016-04-06 05:47:14 +00:00
Erik Kline
09a5fbd6ec Don\'t flush DNS cache on route changes.
am: 9488787

* commit '94887874e385797ac5290e867fe412b9d6fc2f9c':
  Don't flush DNS cache on route changes.

Change-Id: I4217b342b63f6d0aa58ecad1b2e84de903563e07
2016-04-06 03:57:00 +00:00
Erik Kline
f46600d074 Make public the registerDefaultNetworkCallback API
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f
2016-04-06 12:22:47 +09:00
Erik Kline
94887874e3 Don't flush DNS cache on route changes.
Since Lollipop, routes are isolated within Networks.  Flushing a
Network's DNS cache whenever that same Network's routes are updated
doesn't provide any benefit.  Any system components depending on this
behaviour need to uncovered and fixed.

Additionally, clean up no-longer-used flushNetworkDnsCache().  This
should be replaced, when needed, by a proper binder interface to netd.

Change-Id: I34bf79e4839da014d466058a876d754209d0c007
2016-04-06 11:30:51 +09:00
Erik Kline
58e0a1c762 Merge "Delete unused DnsPinger" into nyc-dev
am: 49e2db1

* commit '49e2db1b10c8b8d6833c8c2d2d6dc7f100489fee':
  Delete unused DnsPinger

Change-Id: Ia5d84694855a9f2a5336b318722b87f40e7d8f4b
2016-04-06 02:14:36 +00:00
Phil Weaver
30457a1dce Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev
am: f13f14e

* commit 'f13f14ef30a147681854223871c1352d154d9d7a':
  Remove unusable a11y APIs for ClickableSpans.

Change-Id: I26a1ef96962058694ecf0c92e9a75e196c2ada99
2016-04-06 02:14:33 +00:00
Erik Kline
49e2db1b10 Merge "Delete unused DnsPinger" into nyc-dev 2016-04-06 02:07:02 +00:00
Svetoslav Ganov
f13f14ef30 Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev 2016-04-06 02:05:42 +00:00
Eino-Ville Talvala
e01da4230f Merge "Camera: Null check remote binder interface" into nyc-dev
am: 255490c

* commit '255490c33cd84b03d164a6c6f4f00680d83e057f':
  Camera: Null check remote binder interface

Change-Id: Ic1e76cd3cdb1c9c0bed5e97676f3ae347a732e88
2016-04-06 01:27:47 +00:00
Eino-Ville Talvala
255490c33c Merge "Camera: Null check remote binder interface" into nyc-dev 2016-04-06 01:19:13 +00:00
Eino-Ville Talvala
0305624f3d Camera: Null check remote binder interface
For LEGACY mode, there's no remote binder, so need to null check for
that case.

Bug: 28000512
Change-Id: I31035f16fd32875d0bd84ca801927498e86133b3
2016-04-05 18:12:11 -07:00
Eino-Ville Talvala
42b53cc1fc Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev
am: 2a6f476

* commit '2a6f4768366b78965326710410fe938644feb60d':
  Camera2: Unlink camera device death listener on disconnect

Change-Id: Iddfc98e8d4aa699f1411d609589d729e323fb994
2016-04-05 23:25:27 +00:00
Jeremy Joslin
7acd105411 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev
am: b770ed1

* commit 'b770ed132813356c2b1548b0a98c1edb565c7340':
  Have the NetworkScoreService bind to the scorer.

Change-Id: I319344d3362068624b4f3bda7f1cf1d563507115
2016-04-05 23:25:18 +00:00
Christopher Tate
1ecb55a2be Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
am: 71f4e14

* commit '71f4e1440202e884f99c00a1012669a5b43c4078':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: I77d195725db157eb22c48f5c6b28dfe30dad2f2b
2016-04-05 23:24:59 +00:00
Kirill Grouchnikov
a8dc3d426f Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev
am: 12454dc

* commit '12454dcab13a0b570937381d11f1c69fdde2fdbf':
  Return correct unfocused month date color for pre-Material themes.

Change-Id: Ia26c44ef5ce30f52149a5781c363865a41dbe9e2
2016-04-05 23:24:55 +00:00
Eino-Ville Talvala
2a6f476836 Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev 2016-04-05 23:07:43 +00:00
Jeremy Joslin
b770ed1328 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 2016-04-05 22:27:11 +00:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
Kirill Grouchnikov
12454dcab1 Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev 2016-04-05 21:48:32 +00:00
Kirill Grouchnikov
7cf1586ce4 Return correct unfocused month date color for pre-Material themes.
Also deprecate setter / getter for showWeekNumber field.

Bug: 28022795
Change-Id: Ie0c33353f76c2a3d9666959a07f6809b7b85183f
2016-04-05 17:42:34 -04:00
Yohei Yukawa
26c8cca109 Merge "Don\'t give IME focus to temporarily detached View." into nyc-dev
am: 1bc62ce

* commit '1bc62ce8468f1e3a8ac41b6e759f145623879ba5':
  Don't give IME focus to temporarily detached View.

Change-Id: I76ec7c37ba58dfaa9398edee05ea0d8dbe174f06
2016-04-05 21:26:47 +00:00
Yohei Yukawa
1bc62ce846 Merge "Don't give IME focus to temporarily detached View." into nyc-dev 2016-04-05 21:21:09 +00:00
Ajay Panicker
b6e1dafe78 Allow factory reset when bluetooth is off (1/2)
Bug: 27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
2016-04-05 20:23:21 +00:00
Sunny Goyal
5e59ea2115 Merge "Changing startListening to only fetch views which are bound" into nyc-dev
am: 60c74e8

* commit '60c74e836fc40d65c8ac58c231956f57d26ec7eb':
  Changing startListening to only fetch views which are bound

Change-Id: I811c2cb1603bef597eb958ff7fbd44a93d7075b2
2016-04-05 18:58:01 +00:00
Chris Craik
3844affcef Merge "Fix software layer alpha" into nyc-dev
am: cd6ea77d

* commit 'cd6ea77d07204d2ff5e1a0264dc24db215de8614':
  Fix software layer alpha

Change-Id: Ic0e8d3d5fa9e290f036d8e4fc59ee460b03020c9
2016-04-05 18:57:56 +00:00
Sunny Goyal
60c74e836f Merge "Changing startListening to only fetch views which are bound" into nyc-dev 2016-04-05 18:53:18 +00:00
Chris Craik
cd6ea77d07 Merge "Fix software layer alpha" into nyc-dev 2016-04-05 18:50:26 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
2016-04-05 17:36:11 +00:00
Oleksiy Vyalov
4588a46850 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev
am: 81c9ea4

* commit '81c9ea4034186cd3ff2c387972389eb3397aba46':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I317d3ee0c8c397671c31b858e9c33bffbe53f7cf
2016-04-05 17:36:09 +00:00
Yohei Yukawa
eadb88fe37 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev
am: e470fcf

* commit 'e470fcfeb001d52c4add58f8420709cb6db7e7c4':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I9f83e4de49c527d629091ffc6cf13297bdd6df3b
2016-04-05 17:28:32 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Oleksiy Vyalov
81c9ea4034 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 2016-04-05 17:27:24 +00:00
Yohei Yukawa
e470fcfeb0 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 2016-04-05 17:22:47 +00:00
Chris Craik
cfa6dade73 Fix software layer alpha
Fixes: 27429404

Software layers must combine layerpaint alpha, if present, with view
alpha.

Change-Id: If9c7dcb53ab8754b4e123cf9cc332a566fd792c4
2016-04-05 10:15:11 -07:00
Dianne Hackborn
eaa18f954a Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev
am: 4345904

* commit '434590405071b462573273637899599332c34187':
  (Docs only) Make battery stats process state docs more clear.

Change-Id: I234a4e3532043fbe00e861bacf48c4240fc2a63b
2016-04-05 17:01:20 +00:00
Dianne Hackborn
4345904050 Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 2016-04-05 16:54:55 +00:00
Dianne Hackborn
a0200e3702 (Docs only) Make battery stats process state docs more clear.
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
2016-04-05 09:54:02 -07:00
Alan Viverette
ec9af6f6b2 Merge "Rewrite popup window positioning algorithm" into nyc-dev
am: 9d8ec0f

* commit '9d8ec0f12ee67129afb4020aa1d91599073cfeab':
  Rewrite popup window positioning algorithm

Change-Id: I8e23de773a1a22278c17e8fb72d4f7b6da1c4921
2016-04-05 16:35:35 +00:00