OSDN Git Service
Fan Zhang [Wed, 6 Apr 2016 19:31:51 +0000 (19:31 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev am:
df634d0
am:
4b2519d
* commit '
4b2519d3c1d1030cae6212e37565ecf42bbef5b2':
Fix animation when expand conditional notices in Settings.
Change-Id: I8109c31e037d2bedba15965210b74fef41077ac1
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
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:51:21 +0000 (17:51 +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
am:
8e13f72
* commit '
8e13f725dc1f1bad626410a5accdbf52bf5b6fc7':
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: Ifee675dfc34c5233af5c2f4f90d8ccef2a6535cc
Alan Viverette [Wed, 6 Apr 2016 17:51:20 +0000 (17:51 +0000)]
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev am:
b5e2f54
am:
28cc7c1
* commit '
28cc7c12c60a5426ec30b4e8dd67f4d95ef7fcd4':
Use normal button style for Clear data / cache buttons
Change-Id: I89e45d6b52875dd163b7e7993febed2262aefea2
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:31:40 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
2de9313 -s ours
am:
5a979a6 -s ours
* commit '
5a979a6fd5b7ae333c40ce73cb14da167edad3de':
Import translations. DO NOT MERGE
Change-Id: Ia7e9646dcc3fa744b596181f74e99b053fd9d2a4
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
Pankaj Kanwar [Wed, 6 Apr 2016 17:17:21 +0000 (17:17 +0000)]
Merge "Fix problem with message indent. b/
25054130" into nyc-dev am:
e6924ce
am:
37ac1d5
* commit '
37ac1d5d46daef83558d2f5b7e7ec8071bf380bc':
Fix problem with message indent. b/
25054130
Change-Id: I8c9205264c3402e0ac7a56015fe6a00e3be1b9f2
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
Bill Yi [Wed, 6 Apr 2016 17:02:35 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE"
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:31:44 +0000 (13:31 +0000)]
Merge "Add dev options to set swXdp" into nyc-dev am:
b22dd20
am:
51970c8
* commit '
51970c855812232a9514958dd67959f18749fbe1':
Add dev options to set swXdp
Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e
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
Bill Yi [Wed, 6 Apr 2016 12:01:30 +0000 (05:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03a1b8b69852dcfd45349cf5f7c0b5e1667df1d1
Auto-generated-cl: translation import
Victor Chang [Wed, 6 Apr 2016 11:07:55 +0000 (11:07 +0000)]
Merge "Add button to trust a CA cert" into nyc-dev am:
b49c901
am:
2bd4e16
* commit '
2bd4e1689f1e154a9a4a1d47ccbe13c6e8f08dea':
Add button to trust a CA cert
Change-Id: If836edae5e6cf7b4759ac6874cef4d324af91f16
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:38:58 +0000 (09:38 +0000)]
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev am:
4ffa5c8
am:
a2810b8
* commit '
a2810b8eaa09fb85f3265b7479ea7cf63b15f596':
Block "Screen lock" menu for Work Challenge.
Change-Id: I4b5003f5479283739817746375de0048128cf8fb
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
Sanket Agarwal [Tue, 5 Apr 2016 23:45:17 +0000 (23:45 +0000)]
Merge "PBAP Pairing Permission" into nyc-dev am:
e5b8ec0
am:
4c74ed33
* commit '
4c74ed3318a11b9ea6754795188093eee85779f1':
PBAP Pairing Permission
Change-Id: I3967a917cfa7c82f3cd439fc1fe3ab8e7a896975
Fyodor Kupolov [Tue, 5 Apr 2016 23:45:17 +0000 (23:45 +0000)]
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev am:
84948db
am:
e1d9fd8
* commit '
e1d9fd83468a3300533e60a7e5823c0e8e44ee89':
Do not store bitmap into Bundle in onSaveInstanceState
Change-Id: I372cc35b9f653d055ca61bd4bcd0911e651990ff
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:54:26 +0000 (18:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
e303983 -s ours
am:
563969c -s ours
* commit '
563969ccc0e34be7d910f4df2220f01fe25d8ad1':
Import translations. DO NOT MERGE
Change-Id: I749dfd8c6baecc26fc1032288a9df257ac5630db
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:44:21 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Bill Yi [Tue, 5 Apr 2016 17:39:19 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf5308c137200996a36b389359c88c6c370991b8
Auto-generated-cl: translation import
Anna Galusza [Tue, 5 Apr 2016 16:57:57 +0000 (16:57 +0000)]
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug:
27777706" into nyc-dev am:
da0e4d3
am:
51ccf7c
* commit '
51ccf7c7a9b0b2625c6e295823c38325438b2ad8':
Add Tron Logging to portion of A11y SUW that lives in Settings. Bug:
27777706
Change-Id: I8f56e88b37c78c0443974a268a196b441edeb68a
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
Jason Monk [Tue, 5 Apr 2016 16:48:57 +0000 (16:48 +0000)]
Merge "Update data saver icon" into nyc-dev am:
72304b5
am:
80058c6
* commit '
80058c6f3a317f46a57cad7ecc97dd7f3d489deb':
Update data saver icon
Change-Id: I4f18f9d9aa2e86ccca04c3d5e4cd8e014b626003
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:13:56 +0000 (15:13 +0000)]
Merge "Listen on new broadcasts for profile changes." into nyc-dev am:
29e73f2
am:
04bc35c
* commit '
04bc35ca6b5926afcbbde08e4ea99518ae00901e':
Listen on new broadcasts for profile changes.
Change-Id: If84146ebc3c410d44812cc13d2b5825ed1493f8d
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
Qi Ding [Tue, 5 Apr 2016 14:41:44 +0000 (14:41 +0000)]
Merge "Fix end padding of summary text for dialog is too narrow" am:
dc07c29 am:
69960b8
am:
cd79f40
* commit '
cd79f4058363a3e8e5366e1261aa8911f3846575':
Fix end padding of summary text for dialog is too narrow
Change-Id: I6f112eb356cc3bf28bd9abff134e317c3cceced9
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:34:22 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
196c7f7 -s ours
am:
e70198d -s ours
* commit '
e70198d27822fd3d60216d535a164ef976fd5c8d':
Import translations. DO NOT MERGE
Change-Id: Idf59d4afa4a8dfde76d6b0aa51ceffd0eeac7f84
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
Bill Yi [Tue, 5 Apr 2016 03:22:02 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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 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
OSDN Git Service
