OSDN Git Service
Bill Yi [Tue, 5 Apr 2016 03:22:02 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 5 Apr 2016 00:26:33 +0000 (17:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I344146b41edaf6d5a98c0159ab4f07e717e077b6
Auto-generated-cl: translation import
Udam Saini [Mon, 4 Apr 2016 20:18:16 +0000 (20:18 +0000)]
Merge "Adds a multi line preference class." into nyc-dev am:
9a8f009
am:
a837edb
* commit '
a837edb3c66014d1244a9e57be963c1f94b1676a':
Adds a multi line preference class.
Change-Id: I4114b9206389d3dedfb288a5ee969461ab514d53
Udam Saini [Mon, 4 Apr 2016 20:13:44 +0000 (20:13 +0000)]
Merge "Adds a multi line preference class." into nyc-dev
am:
9a8f009
* commit '
9a8f0098805f225f84b5adbc11a76ffc7afe7a8b':
Adds a multi line preference class.
Change-Id: Ibbea8a472b7c2514c32d451c597970470d9a8e17
Udam Saini [Mon, 4 Apr 2016 20:06:29 +0000 (20:06 +0000)]
Merge "Adds a multi line preference class." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 19:52:28 +0000 (19:52 +0000)]
Merge "Show fewer filters on notifications page." into nyc-dev am:
a003fa5
am:
41317c6
* commit '
41317c639ca45b3e9d49e7b68897a52ca5596a4b':
Show fewer filters on notifications page.
Change-Id: I601b7ebab89437b9651fee3e5282890b203d844c
Julia Reynolds [Mon, 4 Apr 2016 19:52:28 +0000 (19:52 +0000)]
Merge "Fix ringtone persistance after device rotation." into nyc-dev am:
cd37e59
am:
6a165a1
* commit '
6a165a1b9d4c2c5ffec0b53ceb4fcaa2a043d6eb':
Fix ringtone persistance after device rotation.
Change-Id: I92643fbaec82df5d7c8fc8a0e777799440e965b3
Julia Reynolds [Mon, 4 Apr 2016 19:48:39 +0000 (19:48 +0000)]
Merge "Show fewer filters on notifications page." into nyc-dev
am:
a003fa5
* commit '
a003fa583cc7ca1aa2b4b98d9a6c2a96d7943e5c':
Show fewer filters on notifications page.
Change-Id: Ie5c4d7139702fcfd3c1b8f696d386c728645cbb1
Julia Reynolds [Mon, 4 Apr 2016 19:48:39 +0000 (19:48 +0000)]
Merge "Fix ringtone persistance after device rotation." into nyc-dev
am:
cd37e59
* commit '
cd37e59b9a1d54a5896dfb0491c32eedb4326939':
Fix ringtone persistance after device rotation.
Change-Id: Ic2453dd647b2e86f7c0ef1177ed7af18f40bcc9a
Jason Monk [Mon, 4 Apr 2016 19:41:05 +0000 (19:41 +0000)]
Merge "Add moar dividers" into nyc-dev am:
da6ae85
am:
ed84c11
* commit '
ed84c11657da0f17176dca77ef1f349aac5baf22':
Add moar dividers
Change-Id: Ia3ecd5c8ef3f35926684f878ecf94afea6f4f658
Julia Reynolds [Mon, 4 Apr 2016 19:39:26 +0000 (19:39 +0000)]
Merge "Show fewer filters on notifications page." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 19:39:13 +0000 (19:39 +0000)]
Merge "Fix ringtone persistance after device rotation." into nyc-dev
Jason Monk [Mon, 4 Apr 2016 19:36:44 +0000 (19:36 +0000)]
Merge "Add moar dividers" into nyc-dev
am:
da6ae85
* commit '
da6ae856a9fc76f05553cc2d9a0d1bb09ae07b29':
Add moar dividers
Change-Id: Ic418d2eac4c41dda4fc8efe9ace712d2a7587fbf
Jason Monk [Mon, 4 Apr 2016 19:29:55 +0000 (19:29 +0000)]
Merge "Add moar dividers" into nyc-dev
Julia Reynolds [Fri, 1 Apr 2016 14:58:34 +0000 (10:58 -0400)]
Show fewer filters on notifications page.
Bug:
27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
Julia Reynolds [Fri, 1 Apr 2016 18:45:58 +0000 (14:45 -0400)]
Fix ringtone persistance after device rotation.
Bug:
26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
Maurice Lam [Mon, 4 Apr 2016 18:08:40 +0000 (18:08 +0000)]
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev am:
f9db17e
am:
4317f90
* commit '
4317f907c4ec7549587d7b39781823ba1b14bac2':
Set LinkMovementMethod in LinkTextView
Change-Id: I1c94868527a0c4ef9da1044fdfa296434efaf564
Maurice Lam [Mon, 4 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
am:
f9db17e
* commit '
f9db17e3ccca5ce4c2ce5504fd6410db4bf52371':
Set LinkMovementMethod in LinkTextView
Change-Id: Ibb4733e2b3c854f57c8101ffa424a64cbb6e1d4e
Maurice Lam [Mon, 4 Apr 2016 17:57:52 +0000 (17:57 +0000)]
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
Yohei Yukawa [Mon, 4 Apr 2016 17:48:01 +0000 (17:48 +0000)]
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev am:
19998fe
am:
4ddc39e
* commit '
4ddc39e17f6758cbf79a393f102dcb5f74910ca7':
Fix PhysicalKeyboardFragment crash bug.
Change-Id: Id779cf9dfab7061045f22f56f249e13a9d5b0c6a
Yohei Yukawa [Mon, 4 Apr 2016 17:43:22 +0000 (17:43 +0000)]
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
am:
19998fe
* commit '
19998fef793c175280440a407bf74567bfc41e50':
Fix PhysicalKeyboardFragment crash bug.
Change-Id: I5e7559eb4b02dd809fbc34d9949ff2737bcc0476
Yohei Yukawa [Mon, 4 Apr 2016 17:28:22 +0000 (17:28 +0000)]
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
Jason Monk [Mon, 4 Apr 2016 17:20:59 +0000 (13:20 -0400)]
Add moar dividers
Bug:
27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
Julia Reynolds [Mon, 4 Apr 2016 14:00:24 +0000 (14:00 +0000)]
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
Julia Reynolds [Mon, 4 Apr 2016 14:00:23 +0000 (14:00 +0000)]
Merge "Lowercase s." into nyc-dev am:
b24cfaf
am:
cf61f2e
* commit '
cf61f2e160b8463474f6978e8a0bcf2b53bd8e13':
Lowercase s.
Change-Id: I6e3efc44b140b2a5828bdb1dd0bdf2fd0af7f8e7
Julia Reynolds [Mon, 4 Apr 2016 13:56:54 +0000 (13:56 +0000)]
Merge "Hide repeat callers instead of disabling." into nyc-dev
am:
03a3a1e
* commit '
03a3a1efd56edbba65750be7a89085c78c64d8d3':
Hide repeat callers instead of disabling.
Change-Id: I76c256e0204d6cb42c09a801005dc0583262e49c
Julia Reynolds [Mon, 4 Apr 2016 13:56:54 +0000 (13:56 +0000)]
Merge "Lowercase s." into nyc-dev
am:
b24cfaf
* commit '
b24cfafd1dfbc95f85341ebd6f355e35d05f8b7e':
Lowercase s.
Change-Id: I6606efd93f4d7550d3004af5be0ad809b4593614
Julia Reynolds [Mon, 4 Apr 2016 13:52:35 +0000 (13:52 +0000)]
Merge "Hide repeat callers instead of disabling." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 13:52:27 +0000 (13:52 +0000)]
Merge "Lowercase s." into nyc-dev
Clara Bayarri [Mon, 4 Apr 2016 12:28:06 +0000 (12:28 +0000)]
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
Clara Bayarri [Mon, 4 Apr 2016 12:24:46 +0000 (12:24 +0000)]
Merge "Remove fullstop at end of phrases" into nyc-dev
am:
bd5eb13
* commit '
bd5eb1331ecc741bae84b1d1093c5102877f36b9':
Remove fullstop at end of phrases
Change-Id: I79391dfad9814397dc6276ffb70042ba67a0543a
Clara Bayarri [Mon, 4 Apr 2016 12:17:00 +0000 (12:17 +0000)]
Merge "Remove fullstop at end of phrases" into nyc-dev
Jeff Sharkey [Sun, 3 Apr 2016 04:14:27 +0000 (04:14 +0000)]
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
Jeff Sharkey [Sun, 3 Apr 2016 04:09:00 +0000 (04:09 +0000)]
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
Jeff Sharkey [Sun, 3 Apr 2016 03:59:21 +0000 (03:59 +0000)]
Merge "Mark UI components for tests to find." into nyc-dev
Jeff Sharkey [Sat, 2 Apr 2016 05:12:45 +0000 (23:12 -0600)]
Mark UI components for tests to find.
Bug:
26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
Yohei Yukawa [Sat, 2 Apr 2016 02:47:47 +0000 (02:47 +0000)]
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
Yohei Yukawa [Sat, 2 Apr 2016 02:42:59 +0000 (02:42 +0000)]
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
Yohei Yukawa [Sat, 2 Apr 2016 02:35:14 +0000 (02:35 +0000)]
Merge "Revert "Fix no keyboard on N builds"" into nyc-dev
Yohei Yukawa [Sat, 2 Apr 2016 00:20:37 +0000 (17:20 -0700)]
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
250faf9243a3e7981695be5274f3352ac1fd41bd.
Bug:
25942488
Bug:
26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18
Maurice Lam [Sat, 2 Apr 2016 00:09:56 +0000 (17:09 -0700)]
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
Jim Miller [Fri, 1 Apr 2016 22:44:23 +0000 (22:44 +0000)]
Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev am:
4a92815
am:
6bc0101
* commit '
6bc01014a7861e0adf1980feb7e2575d6715aa0f':
Fix crash in ConfirmDeviceCredentials
Change-Id: I0dfcff28cffe92871262344e90434038899b94d9
Jim Miller [Fri, 1 Apr 2016 22:32:26 +0000 (22:32 +0000)]
Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev
am:
4a92815
* commit '
4a92815acd6aad8a22b74fd7d22a5c83feff3266':
Fix crash in ConfirmDeviceCredentials
Change-Id: I4770a45e4888909cc54d9c2aa334bc13e5726483
Jim Miller [Fri, 1 Apr 2016 22:14:44 +0000 (22:14 +0000)]
Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev
Wei Huang [Fri, 1 Apr 2016 19:17:51 +0000 (19:17 +0000)]
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
Wei Huang [Fri, 1 Apr 2016 19:13:19 +0000 (19:13 +0000)]
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
Amit Mahajan [Fri, 1 Apr 2016 18:58:25 +0000 (18:58 +0000)]
Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev
Wei Huang [Thu, 17 Apr 2014 05:10:50 +0000 (14:10 +0900)]
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
Rachel Zhang [Fri, 1 Apr 2016 17:35:47 +0000 (17:35 +0000)]
Merge "Add suggestion carousel view and dependencies to settings"
Fan Zhang [Fri, 1 Apr 2016 16:08:47 +0000 (16:08 +0000)]
Merge "Add an empty status fragment for status and suggestions."
Fan Zhang [Thu, 24 Mar 2016 20:01:05 +0000 (13:01 -0700)]
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
Tyler Gunn [Fri, 1 Apr 2016 16:03:27 +0000 (16:03 +0000)]
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
Tyler Gunn [Fri, 1 Apr 2016 15:58:41 +0000 (15:58 +0000)]
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
Tyler Gunn [Fri, 1 Apr 2016 15:43:08 +0000 (15:43 +0000)]
Merge "Adding "wifi only" option for wifi calling." into nyc-dev
Tyler Gunn [Fri, 1 Apr 2016 15:41:18 +0000 (08:41 -0700)]
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
Fan Zhang [Fri, 1 Apr 2016 15:21:41 +0000 (15:21 +0000)]
Merge "Move actionbar menu from DashboardSummary to container."
Julia Reynolds [Fri, 1 Apr 2016 14:54:34 +0000 (10:54 -0400)]
Hide repeat callers instead of disabling.
Bug:
27724390
Change-Id: I4f538138d010f306ce6467122c8aef89eaa81ed5
Julia Reynolds [Fri, 1 Apr 2016 14:53:10 +0000 (10:53 -0400)]
Lowercase s.
Bug:
27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
Julia Reynolds [Fri, 1 Apr 2016 14:06:48 +0000 (14:06 +0000)]
Add null checks on filters. am:
e89bebe
am:
e723b0f
* commit '
e723b0f0f77e02503a99895def4634508bf852a6':
Add null checks on filters.
Change-Id: I0fcc68f270b51680452dc8041111a1d6225d8a8d
Julia Reynolds [Fri, 1 Apr 2016 14:02:30 +0000 (14:02 +0000)]
Add null checks on filters.
am:
e89bebe
* commit '
e89bebe96f547fc7e6badf3e2bc80eebdda7793c':
Add null checks on filters.
Change-Id: I728a29989c9fa3afaac853dbba6d362160e44667
Julia Reynolds [Fri, 1 Apr 2016 13:47:32 +0000 (09:47 -0400)]
Add null checks on filters.
Bug:
27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f
Clara Bayarri [Wed, 30 Mar 2016 13:58:27 +0000 (14:58 +0100)]
Remove fullstop at end of phrases
Requested by UX
Bug:
27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
Yohei Yukawa [Fri, 1 Apr 2016 10:53:34 +0000 (03:53 -0700)]
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
Clara Bayarri [Fri, 1 Apr 2016 11:31:23 +0000 (11:31 +0000)]
Merge "Change Work Challenge background image" into nyc-dev am:
63096e9
am:
dfae146
* commit '
dfae1467ea6304da96f8505c683e9cc205c1e7dd':
Change Work Challenge background image
Change-Id: Ibef0bc4a8164b0f496ee1e2b77b1307d23931701
Clara Bayarri [Fri, 1 Apr 2016 11:27:42 +0000 (11:27 +0000)]
Merge "Change Work Challenge background image" into nyc-dev
am:
63096e9
* commit '
63096e965c1ff95b8b7eed53388aa00014500381':
Change Work Challenge background image
Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
Clara Bayarri [Fri, 1 Apr 2016 11:18:24 +0000 (11:18 +0000)]
Merge "Change Work Challenge background image" into nyc-dev
Yohei Yukawa [Fri, 1 Apr 2016 08:05:31 +0000 (08:05 +0000)]
Fix jank when dismissing InputMethodAndSubtypeEnabler. am:
6452b84
am:
7be3dd3
* commit '
7be3dd3ee3000a1db15ff163bc208f718358629b':
Fix jank when dismissing InputMethodAndSubtypeEnabler.
Change-Id: I708b4a7f9274488c07db26145f364dcbe7e64524
Yohei Yukawa [Fri, 1 Apr 2016 08:01:23 +0000 (08:01 +0000)]
Fix jank when dismissing InputMethodAndSubtypeEnabler.
am:
6452b84
* commit '
6452b84763f864139a3744bd3406f72a0014301a':
Fix jank when dismissing InputMethodAndSubtypeEnabler.
Change-Id: I36ddc96a4551d0afee1b4334b6b01cb5f6305724
Yohei Yukawa [Fri, 1 Apr 2016 05:58:33 +0000 (22:58 -0700)]
Fix jank when dismissing InputMethodAndSubtypeEnabler.
InputMethodAndSubtypeUtil#saveInputMethodSubtypeList() has a bug that
it saves implicitly enabled subtypes when "Use system languages" is
checked. Implicitly enabled subtypes are transient data and the system
should have only a null data (0) in the persistent strage. The root
cause of this bug is that the method in question has not checked whether
the preference item is in enabled (not grayed-out). If it is
grayed-out, its checked state does not mean that the user manually
checked that subtype but it is just an indicator for the user.
The strange UI jank when dismissing InputMethodAndSubtypeEnabler is one
of the victim of the above bug because we have worked around it by
actually changing checked state before calling the method in question.
With this CL we no longer need to update preference items in
InputMethodAndSubtypeEnabler#onPause().
Bug:
27867966
Change-Id: Ifc291d77ea41a988438765b9ba16bc5d18a15e1b
Fan Zhang [Tue, 29 Mar 2016 17:43:02 +0000 (10:43 -0700)]
Move actionbar menu from DashboardSummary to container.
Bug:
27751187
Change-Id: I7730f104805abcbb6d243fccac94e39fad26ddd2
Rachel Zhang [Wed, 30 Mar 2016 22:42:50 +0000 (15:42 -0700)]
Add suggestion carousel view and dependencies to settings
Bug:
27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
Udam Saini [Thu, 31 Mar 2016 20:48:52 +0000 (20:48 +0000)]
Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev am:
a2dda41
am:
44193d5
* commit '
44193d50361e945982189928005cb517dd73531f':
Fixes graybar as status bar and unshifts header view.
Change-Id: Iefc222d7a63738a71d50502ce8b8d03a9aee919e
Udam Saini [Thu, 31 Mar 2016 20:42:06 +0000 (20:42 +0000)]
Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev
am:
a2dda41
* commit '
a2dda4122bb73f49fcd118a712c1aa61a303c11b':
Fixes graybar as status bar and unshifts header view.
Change-Id: I29cc18ed77ea763385a9a96281da302d4d6c0185
Udam Saini [Thu, 31 Mar 2016 20:30:28 +0000 (20:30 +0000)]
Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev
Udam Saini [Thu, 31 Mar 2016 20:26:42 +0000 (20:26 +0000)]
Merge "Prevents users from being added if device is not provisioned" into nyc-dev am:
e20deea
am:
9f7d237
* commit '
9f7d2375806bcfc7dc873e51b228e69e57e093b8':
Prevents users from being added if device is not provisioned
Change-Id: I255f6f284aafc68f66d3a8956c5f9a8ba85525a3
Udam Saini [Thu, 31 Mar 2016 20:23:24 +0000 (20:23 +0000)]
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
am:
e20deea
* commit '
e20deea7112a17ac4799f6924cddc27b4678f791':
Prevents users from being added if device is not provisioned
Change-Id: Ieb663a2741bce75cd9cebed08f36801a36958e83
Udam Saini [Thu, 31 Mar 2016 20:13:39 +0000 (20:13 +0000)]
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
Christopher Tate [Thu, 31 Mar 2016 19:42:42 +0000 (19:42 +0000)]
Merge "Track in-progress wallpaper API changes" into nyc-dev am:
cb77df2
am:
e714194
* commit '
e7141949edd4c5aeb4366e8e773cc6f16ade2950':
Track in-progress wallpaper API changes
Change-Id: I6ad24595aee24d5ce3be7e8e230295e9cca6fa2e
Christopher Tate [Thu, 31 Mar 2016 19:35:57 +0000 (19:35 +0000)]
Merge "Track in-progress wallpaper API changes" into nyc-dev
am:
cb77df2
* commit '
cb77df22609179aacf985818fd512719f7ea98f7':
Track in-progress wallpaper API changes
Change-Id: Ia1df1b0dbf5880a94c6c2b6f6d5c3208a951ef40
Chris Tate [Thu, 31 Mar 2016 19:24:41 +0000 (19:24 +0000)]
Merge "Track in-progress wallpaper API changes" into nyc-dev
Robin Lee [Thu, 31 Mar 2016 18:59:00 +0000 (18:59 +0000)]
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev am:
4d29ab3
am:
e79fed2
* commit '
e79fed2839bbb70c1df111947208e00833057154':
DISALLOW_CONFIG_CREDENTIALS blocks user credentials
Change-Id: I53a5b108a62f679e731164a8ac21f121ad21cabf
Robin Lee [Thu, 31 Mar 2016 18:55:32 +0000 (18:55 +0000)]
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
am:
4d29ab3
* commit '
4d29ab31455ae7c7eef91871230e34b3ecc452e1':
DISALLOW_CONFIG_CREDENTIALS blocks user credentials
Change-Id: I20a82efa39f5116ba3919198418873e794fa5240
Robin Lee [Thu, 31 Mar 2016 18:44:21 +0000 (18:44 +0000)]
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
Ying Wang [Thu, 31 Mar 2016 18:16:55 +0000 (11:16 -0700)]
Remove obsolete LOCAL_DX_FLAGS
Bug:
27400061
Change-Id: Ia65d8ebdbb96d34fe12badc0015716d5d9fde0ca
Jason Monk [Thu, 31 Mar 2016 18:10:30 +0000 (18:10 +0000)]
Merge "Fix missing summaries" into nyc-dev am:
8143d2a
am:
f3a5f79
* commit '
f3a5f7986d41f126d6589296b207285247fb4f8e':
Fix missing summaries
Change-Id: I6dc00e18687f801a23e12204b7627935bbc90e74
Jason Monk [Thu, 31 Mar 2016 18:04:19 +0000 (18:04 +0000)]
Merge "Fix missing summaries" into nyc-dev
am:
8143d2a
* commit '
8143d2adb345aefafdaa38ed12ab86b1a5fb0574':
Fix missing summaries
Change-Id: Ibaaf35f6a429220a8e34621dcf16c4396044c5c5
Jason Monk [Thu, 31 Mar 2016 18:00:54 +0000 (18:00 +0000)]
Merge "Fix missing summaries" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 17:59:46 +0000 (13:59 -0400)]
Fix missing summaries
Handle non-cached tiles by doing lookup from component name.
Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes:
27942733
mariagpuyol [Thu, 31 Mar 2016 17:46:39 +0000 (17:46 +0000)]
Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev am:
6d6ea3f
am:
d0ba082
* commit '
d0ba082ca732b0effe15067d93b22e292a96237c':
Use same task for Settings>Users and EmergencyInfo
Change-Id: Idbb6fc5505039055825f8118cad1277966c29ae3
Victor Chang [Thu, 31 Mar 2016 17:46:38 +0000 (17:46 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am:
b1d7142
am:
5cffb81
* commit '
5cffb81f567009e589e2bbc8ccd3dcae15147f13':
Show notification when failing to turn on always-on vpn
Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
Robin Lee [Fri, 11 Mar 2016 16:22:23 +0000 (16:22 +0000)]
DISALLOW_CONFIG_CREDENTIALS blocks user credentials
All settings preferences related to credentials of any kind should be
stopped by this user restriction.
Bug:
26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
mariagpuyol [Thu, 31 Mar 2016 17:44:34 +0000 (17:44 +0000)]
Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev
am:
6d6ea3f
* commit '
6d6ea3fe0a9aae6159b3eda197cd1d660135c413':
Use same task for Settings>Users and EmergencyInfo
Change-Id: Ifc596101c4392bb76f2d6038c364560ebc42fefa
Victor Chang [Thu, 31 Mar 2016 17:44:34 +0000 (17:44 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
am:
b1d7142
* commit '
b1d7142cb21de23ec9c1dddb824405bf252bffed':
Show notification when failing to turn on always-on vpn
Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
Maria Garcia Puyol [Thu, 31 Mar 2016 17:38:55 +0000 (17:38 +0000)]
Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev
Victor Chang [Thu, 31 Mar 2016 17:04:53 +0000 (17:04 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
Christopher Tate [Thu, 31 Mar 2016 16:56:37 +0000 (09:56 -0700)]
Track in-progress wallpaper API changes
FLAG_*, not FLAG_SET_*
Bug
27365822
Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
Jason Monk [Thu, 31 Mar 2016 15:50:46 +0000 (15:50 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev am:
69446e8
am:
d09508b
* commit '
d09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
Fix categeries being read out on settings dashboard
Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
Jason Monk [Thu, 31 Mar 2016 15:50:46 +0000 (15:50 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev am:
04f10a5
am:
e0ec32c
* commit '
e0ec32c26e580b5dca8c1968f20949021d37211f':
Fix cell data preference in single sim case
Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086
Jason Monk [Thu, 31 Mar 2016 15:50:44 +0000 (15:50 +0000)]
Merge changes from topic \'SettingsMetrics\' into nyc-dev am:
50b9592
am:
5c4e4bc
* commit '
5c4e4bcb63bcf01907a0b871b4793a029ddb1968':
Add metrics for suggestions
Add metrics for settings conditionals
Change-Id: Ic33116cf8ef78094a026ef61514019769e44e674
Bill Yi [Thu, 31 Mar 2016 15:50:43 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
645c198 -s ours
am:
987b621 -s ours
* commit '
987b6211574463a3ed139373dd3e1b241dae64d5':
Import translations. DO NOT MERGE
Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b