Commit Graph

26460 Commits

Author SHA1 Message Date
Maurice Lam
3709f86dcc Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev am: f9db17e
am: 4317f90

* commit '4317f907c4ec7549587d7b39781823ba1b14bac2':
  Set LinkMovementMethod in LinkTextView

Change-Id: I1c94868527a0c4ef9da1044fdfa296434efaf564
2016-04-04 18:08:40 +00:00
Maurice Lam
4317f907c4 Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
am: f9db17e

* commit 'f9db17e3ccca5ce4c2ce5504fd6410db4bf52371':
  Set LinkMovementMethod in LinkTextView

Change-Id: Ibb4733e2b3c854f57c8101ffa424a64cbb6e1d4e
2016-04-04 18:04:12 +00:00
Maurice Lam
f9db17e3cc Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev 2016-04-04 17:57:52 +00:00
Yohei Yukawa
86649db6d1 Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev am: 19998fe
am: 4ddc39e

* commit '4ddc39e17f6758cbf79a393f102dcb5f74910ca7':
  Fix PhysicalKeyboardFragment crash bug.

Change-Id: Id779cf9dfab7061045f22f56f249e13a9d5b0c6a
2016-04-04 17:48:01 +00:00
Yohei Yukawa
4ddc39e17f Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
am: 19998fe

* commit '19998fef793c175280440a407bf74567bfc41e50':
  Fix PhysicalKeyboardFragment crash bug.

Change-Id: I5e7559eb4b02dd809fbc34d9949ff2737bcc0476
2016-04-04 17:43:22 +00:00
Yohei Yukawa
19998fef79 Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev 2016-04-04 17:28:23 +00:00
Julia Reynolds
858e0d3dc6 Merge "Hide repeat callers instead of disabling." into nyc-dev am: 03a3a1e
am: 7effca5

* commit '7effca50d49f635bdf5e575573af0321d7c0f80a':
  Hide repeat callers instead of disabling.

Change-Id: I73700f6f4242532934ac01c5297525d1ff52aa73
2016-04-04 14:00:24 +00:00
Julia Reynolds
5360308d18 Merge "Lowercase s." into nyc-dev am: b24cfaf
am: cf61f2e

* commit 'cf61f2e160b8463474f6978e8a0bcf2b53bd8e13':
  Lowercase s.

Change-Id: I6e3efc44b140b2a5828bdb1dd0bdf2fd0af7f8e7
2016-04-04 14:00:23 +00:00
Julia Reynolds
7effca50d4 Merge "Hide repeat callers instead of disabling." into nyc-dev
am: 03a3a1e

* commit '03a3a1efd56edbba65750be7a89085c78c64d8d3':
  Hide repeat callers instead of disabling.

Change-Id: I76c256e0204d6cb42c09a801005dc0583262e49c
2016-04-04 13:56:54 +00:00
Julia Reynolds
cf61f2e160 Merge "Lowercase s." into nyc-dev
am: b24cfaf

* commit 'b24cfafd1dfbc95f85341ebd6f355e35d05f8b7e':
  Lowercase s.

Change-Id: I6606efd93f4d7550d3004af5be0ad809b4593614
2016-04-04 13:56:54 +00:00
Julia Reynolds
03a3a1efd5 Merge "Hide repeat callers instead of disabling." into nyc-dev 2016-04-04 13:52:36 +00:00
Julia Reynolds
b24cfafd1d Merge "Lowercase s." into nyc-dev 2016-04-04 13:52:27 +00:00
Clara Bayarri
234f737610 Merge "Remove fullstop at end of phrases" into nyc-dev am: bd5eb13
am: 4b91148

* commit '4b91148b3d2d3126cb5463f4401d651af7f0206f':
  Remove fullstop at end of phrases

Change-Id: I22eb5096a610569007e09fe5b7f3e96fdfe5c2af
2016-04-04 12:28:06 +00:00
Clara Bayarri
4b91148b3d Merge "Remove fullstop at end of phrases" into nyc-dev
am: bd5eb13

* commit 'bd5eb1331ecc741bae84b1d1093c5102877f36b9':
  Remove fullstop at end of phrases

Change-Id: I79391dfad9814397dc6276ffb70042ba67a0543a
2016-04-04 12:24:46 +00:00
Clara Bayarri
bd5eb1331e Merge "Remove fullstop at end of phrases" into nyc-dev 2016-04-04 12:17:00 +00:00
Jeff Sharkey
a6ea5a4bdc Merge "Mark UI components for tests to find." into nyc-dev am: 9069181
am: 6cd645a

* commit '6cd645a4879c58fb19a1a9713088c31c652e7b35':
  Mark UI components for tests to find.

Change-Id: I8f0075afaccbcf7ec718bc09c847eb3e23860b27
2016-04-03 04:14:27 +00:00
Jeff Sharkey
6cd645a487 Merge "Mark UI components for tests to find." into nyc-dev
am: 9069181

* commit '9069181c847168896c6fac97e8869944c97f0f2e':
  Mark UI components for tests to find.

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
2016-04-03 04:09:00 +00:00
Jeff Sharkey
9069181c84 Merge "Mark UI components for tests to find." into nyc-dev 2016-04-03 03:59:21 +00:00
Jeff Sharkey
a77652fea9 Mark UI components for tests to find.
Bug: 26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
2016-04-01 23:18:11 -06:00
Yohei Yukawa
1cdd977c69 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev am: 3ace856
am: fb43d8d

* commit 'fb43d8d1002dce58ec7ed4dfe9f7dc62b3b29d2e':
  Revert "Fix no keyboard on N builds"

Change-Id: I6be5e343e3ce25fdcd8cb3e66b8e0f77e3265801
2016-04-02 02:47:47 +00:00
Yohei Yukawa
fb43d8d100 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev
am: 3ace856

* commit '3ace856ed788349f1e8e343fc6fb4e3bc2a26033':
  Revert "Fix no keyboard on N builds"

Change-Id: I622451e204e0277d9190c6c3ab72b6595b47f6c6
2016-04-02 02:42:59 +00:00
Yohei Yukawa
3ace856ed7 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev 2016-04-02 02:35:14 +00:00
Yohei Yukawa
7bb0465687 Revert "Fix no keyboard on N builds"
This reverts the previous commit [1] since the keyboard shows up without
such a workaround.  Presumably someone might have fixed something in
somewhere.

 [1]: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
      250faf9243.

Bug: 25942488
Bug: 26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18
2016-04-01 17:20:37 -07:00
Maurice Lam
ac6ab03515 Set LinkMovementMethod in LinkTextView
With ag/899084 TextView no longer automatically sets the
LinkMovementMethod when setText is called with a ClickableSpan.
So in LinkTextView we do that manually instead.

Bug: 27973982
Change-Id: I86626bd71bf2ca41cb7e73d479ba764e809b0190
2016-04-01 17:12:10 -07:00
Jim Miller
12e5dd53af Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev am: 4a92815
am: 6bc0101

* commit '6bc01014a7861e0adf1980feb7e2575d6715aa0f':
  Fix crash in ConfirmDeviceCredentials

Change-Id: I0dfcff28cffe92871262344e90434038899b94d9
2016-04-01 22:44:23 +00:00
Jim Miller
6bc01014a7 Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev
am: 4a92815

* commit '4a92815acd6aad8a22b74fd7d22a5c83feff3266':
  Fix crash in ConfirmDeviceCredentials

Change-Id: I4770a45e4888909cc54d9c2aa334bc13e5726483
2016-04-01 22:32:26 +00:00
Jim Miller
4a92815acd Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev 2016-04-01 22:14:45 +00:00
Wei Huang
e21aff765a Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev am: e652b7b
am: ea4ca2e

* commit 'ea4ca2e09622610d3ee0cfbfc5405949e7d00e4d':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I7f492f1cf5aea400ac0a6df719975be531e1b48d
2016-04-01 19:17:51 +00:00
Wei Huang
ea4ca2e096 Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev
am: e652b7b

* commit 'e652b7b0cade699a396f55602f5d7a282466c705':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I12079a64d44b8578d258ef0afd4391b53016c709
2016-04-01 19:13:19 +00:00
Amit Mahajan
e652b7b0ca Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev 2016-04-01 18:58:25 +00:00
Wei Huang
84fd69a783 MVNO value is not grayed out when MVNO type is none
MVNO type is judged as none by comparing key string to "None",
but this logic does not work when language setting is non English
because key is not "None" due to translation.

Bug: 27267663
Change-Id: Ic39a084cd77f661f833b13106dc28444926487d8
2016-04-01 18:57:22 +00:00
Rachel Zhang
12b2261033 Merge "Add suggestion carousel view and dependencies to settings" 2016-04-01 17:35:47 +00:00
Fan Zhang
e5287f10ce Merge "Add an empty status fragment for status and suggestions." 2016-04-01 16:08:48 +00:00
Fan Zhang
3feafd22ed Add an empty status fragment for status and suggestions.
Bug: 27927402

Also add a TabLayout to show title for these fragments, inspired by
http://goo.gl/aOt51Q

Change-Id: I40bab3075480670558ac9a896337109f10e8c90c
2016-04-01 09:07:31 -07:00
Tyler Gunn
746aa34f5a Merge "Adding "wifi only" option for wifi calling." into nyc-dev am: 00c334c
am: d5eb67f

* commit 'd5eb67f5662c615e92a9c78e2691a01c58166b6e':
  Adding "wifi only" option for wifi calling.

Change-Id: I7e9fa3ec4adf01ac8d237edfd904f05ef1ae9306
2016-04-01 16:03:27 +00:00
Tyler Gunn
d5eb67f566 Merge "Adding "wifi only" option for wifi calling." into nyc-dev
am: 00c334c

* commit '00c334ccba341761af448805ddfc842394f3dfbb':
  Adding "wifi only" option for wifi calling.

Change-Id: I7766c8b09b3713fa75c72838f7136bd8dc32b332
2016-04-01 15:58:41 +00:00
Tyler Gunn
00c334ccba Merge "Adding "wifi only" option for wifi calling." into nyc-dev 2016-04-01 15:43:08 +00:00
Tyler Gunn
2013ba8ed1 Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option.  If it does not, changes the
entries/values to a ser which does not include the wifi-only option.

Bug: 27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
2016-04-01 08:41:18 -07:00
Fan Zhang
70e30bb57b Merge "Move actionbar menu from DashboardSummary to container." 2016-04-01 15:21:42 +00:00
Julia Reynolds
e605e32522 Hide repeat callers instead of disabling.
Bug: 27724390
Change-Id: I4f538138d010f306ce6467122c8aef89eaa81ed5
2016-04-01 10:54:34 -04:00
Julia Reynolds
96ddca3519 Lowercase s.
Bug: 27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
2016-04-01 10:53:10 -04:00
Julia Reynolds
e606fd8a5e Add null checks on filters. am: e89bebe
am: e723b0f

* commit 'e723b0f0f77e02503a99895def4634508bf852a6':
  Add null checks on filters.

Change-Id: I0fcc68f270b51680452dc8041111a1d6225d8a8d
2016-04-01 14:06:48 +00:00
Julia Reynolds
e723b0f0f7 Add null checks on filters.
am: e89bebe

* commit 'e89bebe96f547fc7e6badf3e2bc80eebdda7793c':
  Add null checks on filters.

Change-Id: I728a29989c9fa3afaac853dbba6d362160e44667
2016-04-01 14:02:30 +00:00
Julia Reynolds
e89bebe96f Add null checks on filters.
Bug: 27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f
2016-04-01 09:47:32 -04:00
Clara Bayarri
3cb2511166 Remove fullstop at end of phrases
Requested by UX

Bug: 27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
2016-04-01 12:39:35 +01:00
Yohei Yukawa
1dff385c16 Fix PhysicalKeyboardFragment crash bug.
The root cause of crash bug #27749932 is that the state mismatch between
when a Loader is created and when the Loader object finishes background
task.  We can easily reproduce this crash by:
  1. Pair two hardware keyboard A and B.
  2. Open Physical Keyboard settings.
  3. Press the power button to turn off the display.
  4. Move keyboard A far away so that it is unpaired.
  5. Press the power button to turn on the display.
  6. Unlock the device.

One of the reasons PhysicalKeyboardFragment was unstable is that loader
ID reuse.  PhysicalKeyboardFragment starts background data loading
because of many events such as #onResume() and #onInputDeviceAdded() but
there are chances that loader ID was reused because we specified
hardware keyboard device index as the loader ID.  This was dangerous
also because device index can change when a device is added and removed.
With his CL each loader object has an unique ID and
PhysicalKeyboardFragment keeps tracking the list of active Loader IDs
only from which PhysicalKeyboardFragment should accept data.

Also, this CL removes dependencies on PhysicalKeyboardFragment from each
loader object so that we can have a clear boundary of responsibility
between data loader and data consumer.

Bug: 27749932
Change-Id: I53fcb2426d028a492c775bb2b4ec6a5419e33bb4
2016-04-01 11:38:25 +00:00
Clara Bayarri
8505258c31 Merge "Change Work Challenge background image" into nyc-dev am: 63096e9
am: dfae146

* commit 'dfae1467ea6304da96f8505c683e9cc205c1e7dd':
  Change Work Challenge background image

Change-Id: Ibef0bc4a8164b0f496ee1e2b77b1307d23931701
2016-04-01 11:31:23 +00:00
Clara Bayarri
dfae1467ea Merge "Change Work Challenge background image" into nyc-dev
am: 63096e9

* commit '63096e965c1ff95b8b7eed53388aa00014500381':
  Change Work Challenge background image

Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
2016-04-01 11:27:42 +00:00
Clara Bayarri
63096e965c Merge "Change Work Challenge background image" into nyc-dev 2016-04-01 11:18:24 +00:00
Yohei Yukawa
80e38e45e1 Fix jank when dismissing InputMethodAndSubtypeEnabler. am: 6452b84
am: 7be3dd3

* commit '7be3dd3ee3000a1db15ff163bc208f718358629b':
  Fix jank when dismissing InputMethodAndSubtypeEnabler.

Change-Id: I708b4a7f9274488c07db26145f364dcbe7e64524
2016-04-01 08:05:31 +00:00