OSDN Git Service
Joseph Pirozzo [Tue, 5 Apr 2016 23:44:12 +0000 (23:44 +0000)]
Merge "PBAP Pairing Permission" into nyc-dev
am:
e5b8ec0
* commit '
e5b8ec020cc03c7ce331b21b2cb56c7000cb69e5':
PBAP Pairing Permission
Change-Id: I336a32e7e220808e67b999a4c0c6471e342a7bc9
Sanket Agarwal [Tue, 5 Apr 2016 23:39:55 +0000 (23:39 +0000)]
Merge "PBAP Pairing Permission" into nyc-dev
Fyodor Kupolov [Tue, 5 Apr 2016 23:34:05 +0000 (23:34 +0000)]
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
am:
84948db
* commit '
84948db8d085a8ea2a33338597dd31b9c9c36eaa':
Do not store bitmap into Bundle in onSaveInstanceState
Change-Id: I2342ef88d5848e82d0e4cd1f262e5828c2d3da88
Fyodor Kupolov [Tue, 5 Apr 2016 22:20:16 +0000 (22:20 +0000)]
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 18:51:23 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e303983 -s ours
* commit '
e303983e5ddd4c86284ea95dad5c64f79f49e52c':
Import translations. DO NOT MERGE
Change-Id: I6415fff0a6bb98a571d7a5376c589ea23a353d53
Bill Yi [Tue, 5 Apr 2016 18:44:35 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 18:25:39 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9359139bccc9223f079201807385a9b4f531474a
Auto-generated-cl: translation import
Fyodor Kupolov [Tue, 5 Apr 2016 17:46:20 +0000 (10:46 -0700)]
Do not store bitmap into Bundle in onSaveInstanceState
It may cause TransactionTooLargeException because of the parcel size limit
Bug:
27990767
Change-Id: Ie1a702810a5c26e25fc485ebae09dc65e2b48e41
Anna Galusza [Tue, 5 Apr 2016 16:55:00 +0000 (16:55 +0000)]
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug:
27777706" into nyc-dev
am:
da0e4d3
* commit '
da0e4d3280917594fc96a9096950524b9bdb643a':
Add Tron Logging to portion of A11y SUW that lives in Settings. Bug:
27777706
Change-Id: I472e177ba8b83b8f952405a05dd81671ff644801
Anna Galusza [Tue, 5 Apr 2016 16:46:29 +0000 (16:46 +0000)]
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug:
27777706" into nyc-dev
Jason Monk [Tue, 5 Apr 2016 16:45:56 +0000 (16:45 +0000)]
Merge "Update data saver icon" into nyc-dev
am:
72304b5
* commit '
72304b5edd62fa14d9f61265eb6dcda0d6aeea59':
Update data saver icon
Change-Id: I44d5e08939a912123bce2d8e92530fc613851c9f
Jason Monk [Tue, 5 Apr 2016 16:38:38 +0000 (16:38 +0000)]
Merge "Update data saver icon" into nyc-dev
Jason Monk [Tue, 5 Apr 2016 16:36:24 +0000 (12:36 -0400)]
Update data saver icon
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes:
28004364
Rubin Xu [Tue, 5 Apr 2016 15:04:55 +0000 (15:04 +0000)]
Merge "Listen on new broadcasts for profile changes." into nyc-dev
am:
29e73f2
* commit '
29e73f2d4c96b73aab15603131f5caccaf9222a4':
Listen on new broadcasts for profile changes.
Change-Id: I18afc97449c378e75f5b93bab227ffd977e60639
Rubin Xu [Tue, 5 Apr 2016 14:52:00 +0000 (14:52 +0000)]
Merge "Listen on new broadcasts for profile changes." into nyc-dev
Jason Monk [Tue, 5 Apr 2016 14:38:54 +0000 (14:38 +0000)]
Merge "Fix end padding of summary text for dialog is too narrow" am:
dc07c29
am:
69960b8
* commit '
69960b8da7eec23fb2ee0b9199c2e2ea9e131a08':
Fix end padding of summary text for dialog is too narrow
Change-Id: I987214f302cd56fd1301ebe7307f843c5da276a5
Qi Ding [Tue, 5 Apr 2016 14:36:07 +0000 (14:36 +0000)]
Merge "Fix end padding of summary text for dialog is too narrow"
am:
dc07c29
* commit '
dc07c2935e46c07e05c6ff85feaa35ccebc49481':
Fix end padding of summary text for dialog is too narrow
Change-Id: Ie3cb6b60d2a404194f6050818048bd443680ec74
Jason Monk [Tue, 5 Apr 2016 14:20:44 +0000 (14:20 +0000)]
Merge "Fix end padding of summary text for dialog is too narrow"
Bill Yi [Tue, 5 Apr 2016 03:29:31 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
196c7f7 -s ours
* commit '
196c7f74dbb1a30bc3898e607f8a70a8233abc65':
Import translations. DO NOT MERGE
Change-Id: I8b9ce1df4ddebca2b4fa9e66d65d80b280586f14
Bill Yi [Tue, 5 Apr 2016 03:22:40 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Qi Ding [Thu, 17 Mar 2016 06:36:59 +0000 (14:36 +0800)]
Fix end padding of summary text for dialog is too narrow
The end padding of summary text is too narrow,
so "dialogPreferredPadding" attribute should be used
as the end padding of the whole list item.
Change-Id: I348c1a0ac8da011b4971b4f38c7f5ee3e295146f
Bill Yi [Tue, 5 Apr 2016 01:10:36 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38d52ee3540f9b1e593d482d2eccb180d7936212
Auto-generated-cl: translation import
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: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
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: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: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
Rubin Xu [Mon, 4 Apr 2016 16:23:46 +0000 (17:23 +0100)]
Listen on new broadcasts for profile changes.
The change is due to API review comments on the platform side.
Bug:
27532254
Change-Id: Iacb87f97148ceead6bf1f1cc7a0671711698b061
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: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: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: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: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
Anna Galusza [Tue, 22 Mar 2016 20:07:44 +0000 (13:07 -0700)]
Add Tron Logging to portion of A11y SUW that lives in Settings.
Bug:
27777706
Change-Id: I0c0f0f1c30ba5b1d40bc4e74faadacbdb93dbc51
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
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
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: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: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: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
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: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: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: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
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
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:43:28 +0000 (15:43 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
am:
69446e8
* commit '
69446e80ab95f7d01b7612a02ae35e75d9b5c609':
Fix categeries being read out on settings dashboard
Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
Jason Monk [Thu, 31 Mar 2016 15:43:28 +0000 (15:43 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
am:
04f10a5
* commit '
04f10a5eb53bb1ed3d70574102b94b17e075132d':
Fix cell data preference in single sim case
Change-Id: I08d74e06819a2d0487149af5bfa40a6124b3100c
Jason Monk [Thu, 31 Mar 2016 15:43:27 +0000 (15:43 +0000)]
Merge changes from topic \'SettingsMetrics\' into nyc-dev
am:
50b9592
* commit '
50b9592e6116f8a6eca5df2753491a7e26ffde6a':
Add metrics for suggestions
Add metrics for settings conditionals
Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1
Bill Yi [Thu, 31 Mar 2016 15:43:27 +0000 (15:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
645c198 -s ours
* commit '
645c198f3e65427017b53957c025b0b3a94ebe52':
Import translations. DO NOT MERGE
Change-Id: I5fd25e9853c625ce669b5ea54e2509351eed24b9
Victor Chang [Mon, 21 Mar 2016 22:57:59 +0000 (22:57 +0000)]
Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
(Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)
Bug:
27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
Jason Monk [Thu, 31 Mar 2016 14:36:44 +0000 (14:36 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 14:35:03 +0000 (10:35 -0400)]
Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes:
26125682
Jason Monk [Thu, 31 Mar 2016 13:56:51 +0000 (13:56 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 13:55:25 +0000 (09:55 -0400)]
Fix cell data preference in single sim case
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes:
27653690
Jason Monk [Thu, 31 Mar 2016 13:47:32 +0000 (13:47 +0000)]
Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
Add metrics for suggestions
Add metrics for settings conditionals
Bill Yi [Thu, 31 Mar 2016 13:23:36 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Yohei Yukawa [Thu, 31 Mar 2016 06:21:39 +0000 (06:21 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
am:
5ffbf2e
* commit '
5ffbf2e39d8ce5bb4f1256564fe060534541c710':
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
Yohei Yukawa [Thu, 31 Mar 2016 06:13:54 +0000 (06:13 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".