OSDN Git Service
Amith Yamasani [Thu, 7 Apr 2016 00:53:05 +0000 (00:53 +0000)]
Merge "Fix user photo popup layout for RTL" am:
6186414
am:
d0d0af8
* commit '
d0d0af817c015f9fee73d445bb7881a9ce9112a2':
Fix user photo popup layout for RTL
Change-Id: Ibe95cb653b9dcce0489abb6187448464083e224d
Ryoji Miyazaki [Thu, 7 Apr 2016 00:50:21 +0000 (00:50 +0000)]
Merge "Fix user photo popup layout for RTL"
am:
6186414
* commit '
6186414be83ac8b0b92ebe566ca3282dfbc4127a':
Fix user photo popup layout for RTL
Change-Id: Iebf266aa4948a2d24a55ba3876f2e15d085b7112
Amith Yamasani [Thu, 7 Apr 2016 00:44:06 +0000 (00:44 +0000)]
Merge "Fix user photo popup layout for RTL"
Andres Morales [Thu, 7 Apr 2016 00:09:13 +0000 (00:09 +0000)]
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
am:
2006403
* commit '
20064037a7e52584a69edbaeccd29c23630a4156':
handle devices that don't support FLASH_LOCK_STATE
Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067
Andres Morales [Thu, 7 Apr 2016 00:00:37 +0000 (00:00 +0000)]
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
Andres Morales [Wed, 6 Apr 2016 20:22:08 +0000 (13:22 -0700)]
handle devices that don't support FLASH_LOCK_STATE
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.
Bug:
27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
Maurice Lam [Wed, 6 Apr 2016 21:39:29 +0000 (21:39 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev
am:
a01e2b9
* commit '
a01e2b96f6c5741e5304e1ae399bbbff32eeaaa4':
Update fingerprint strings during setup
Change-Id: I1a212f2c1d8e28f6743bfbc38e92f1a9cad723aa
Maurice Lam [Wed, 6 Apr 2016 21:34:34 +0000 (21:34 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev
Fan Zhang [Wed, 6 Apr 2016 19:26:11 +0000 (19:26 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
am:
df634d0
* commit '
df634d03c52ea88f64855935810ee45250fa8528':
Fix animation when expand conditional notices in Settings.
Change-Id: I40ba59ed57d8bd8c82f400bf4dcba7bc7fa794ab
Maurice Lam [Wed, 6 Apr 2016 19:21:54 +0000 (12:21 -0700)]
Update fingerprint strings during setup
Bug:
28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
Fan Zhang [Wed, 6 Apr 2016 19:07:10 +0000 (19:07 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
Anna Galusza [Wed, 6 Apr 2016 17:48:16 +0000 (17:48 +0000)]
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
am:
a3d8c31
* commit '
a3d8c316d4902edb97fe6c5c257a47406b1c30bb':
Revert "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" Framework bug was fixed by ag/900274, so this is no longer needed.
Change-Id: I9ef886bd7bdad975a55411ed5830837f3d965f0f
Anna Galusza [Wed, 6 Apr 2016 17:47:09 +0000 (17:47 +0000)]
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 17:45:19 +0000 (17:45 +0000)]
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev
am:
b5e2f54
* commit '
b5e2f54cc3cc07391d28b5e044d7d03389226272':
Use normal button style for Clear data / cache buttons
Change-Id: Ifaee51792629609924b623461e1b0a91938dc4d5
Alan Viverette [Wed, 6 Apr 2016 17:36:35 +0000 (17:36 +0000)]
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev
Bill Yi [Wed, 6 Apr 2016 17:26:18 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2de9313 -s ours
* commit '
2de9313d2ce487bbf9ebdbdee3cbb040c0bcd711':
Import translations. DO NOT MERGE
Change-Id: Icfaededc7c12f9ca73b03d37680e589e5ecda14b
Bill Yi [Wed, 6 Apr 2016 17:10:09 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
pkanwar [Wed, 6 Apr 2016 17:08:21 +0000 (17:08 +0000)]
Merge "Fix problem with message indent. b/
25054130" into nyc-dev
am:
e6924ce
* commit '
e6924ce8caa2177df5819abc2c7c1ebd91077038':
Fix problem with message indent. b/
25054130
Change-Id: I8581d1b47ebc5334e8baaca7209644ad3df19fb0
Fan Zhang [Tue, 5 Apr 2016 20:21:52 +0000 (13:21 -0700)]
Fix animation when expand conditional notices in Settings.
Bug:
28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
Pankaj Kanwar [Wed, 6 Apr 2016 16:58:09 +0000 (16:58 +0000)]
Merge "Fix problem with message indent. b/
25054130" into nyc-dev
pkanwar [Wed, 6 Apr 2016 02:05:10 +0000 (19:05 -0700)]
Fix problem with message indent.
b/
25054130
Change-Id: I16327683f970c5b9a23316984e1815227d265c57
Jason Monk [Wed, 6 Apr 2016 13:29:09 +0000 (13:29 +0000)]
Merge "Add dev options to set swXdp" into nyc-dev
am:
b22dd20
* commit '
b22dd2071ff35294a2a2663fa5b77064f5dab773':
Add dev options to set swXdp
Change-Id: Iad0577e86d364977faaa9f02c91507774cf9ab62
Jason Monk [Wed, 6 Apr 2016 13:20:07 +0000 (13:20 +0000)]
Merge "Add dev options to set swXdp" into nyc-dev
Bill Yi [Wed, 6 Apr 2016 12:47:27 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0788997407affde8dcfbcbf0f8476bc9d0d14d56
Auto-generated-cl: translation import
Victor Chang [Wed, 6 Apr 2016 11:04:59 +0000 (11:04 +0000)]
Merge "Add button to trust a CA cert" into nyc-dev
am:
b49c901
* commit '
b49c901f8ea6a2408755f62423eccb4be92d6ca6':
Add button to trust a CA cert
Change-Id: I39906ba5bcd57de254b028222099a3cda4e6b8ee
Victor Chang [Wed, 6 Apr 2016 10:59:19 +0000 (10:59 +0000)]
Merge "Add button to trust a CA cert" into nyc-dev
Oleksandr Peletskyi [Wed, 6 Apr 2016 09:36:14 +0000 (09:36 +0000)]
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
am:
4ffa5c8
* commit '
4ffa5c8af5ad7042e74e3cfddd407ad1161cb544':
Block "Screen lock" menu for Work Challenge.
Change-Id: Ifc34a13c1ee69db2e61c4fdf7864ff092a2c97d2
Oleksandr Peletskyi [Wed, 6 Apr 2016 09:31:22 +0000 (09:31 +0000)]
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
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
Victor Chang [Mon, 4 Apr 2016 18:10:28 +0000 (19:10 +0100)]
Add button to trust a CA cert
- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL
Bug:
18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5
Jason Monk [Tue, 5 Apr 2016 19:45:27 +0000 (15:45 -0400)]
Add dev options to set swXdp
Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes:
27734698
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
Alan Viverette [Fri, 1 Apr 2016 15:12:24 +0000 (11:12 -0400)]
Use normal button style for Clear data / cache buttons
Bug:
27967106
Change-Id: I251edc122a74c69e8174b8467c36c28ca47aa853
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
OSDN Git Service
