OSDN Git Service
Ruben Brunk [Fri, 8 Apr 2016 05:18:52 +0000 (05:18 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
am:
77359ad
* commit '
77359ad76117c3ffc7fe40890f8bbdc8736f143c':
Fix Settings activity typo.
Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
Ruben Brunk [Fri, 8 Apr 2016 05:13:18 +0000 (05:13 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
Ruben Brunk [Fri, 8 Apr 2016 04:45:41 +0000 (21:45 -0700)]
Fix Settings activity typo.
Bug=
28078304
Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
Toni Barzic [Thu, 7 Apr 2016 23:21:17 +0000 (23:21 +0000)]
Teach settings about PASSWORD_QUALITY_MANAGED constant
am:
e7d6e4d
* commit '
e7d6e4ddb2371dc49015e17e2d6b9dc604fbbf58':
Teach settings about PASSWORD_QUALITY_MANAGED constant
Change-Id: Iae34431928a38b8bf7de0f59fb0b7bfb306760ff
Toni Barzic [Wed, 30 Mar 2016 18:43:19 +0000 (11:43 -0700)]
Teach settings about PASSWORD_QUALITY_MANAGED constant
Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.
BUG=
27923581
Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a
Ricky Wai [Thu, 7 Apr 2016 16:30:20 +0000 (16:30 +0000)]
Fix work profile screen timeout policy
am:
36cce83
* commit '
36cce830b9319985b138432b89ea1022acf68785':
Fix work profile screen timeout policy
Change-Id: If444464cd47efd2ced9c7b3d4f99465ab48360ea
Ricky Wai [Fri, 18 Mar 2016 16:26:35 +0000 (16:26 +0000)]
Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug:
27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
Ricky Wai [Thu, 7 Apr 2016 15:53:08 +0000 (15:53 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe
am:
751de37
* commit '
751de372750336c2dbc6ed656de84b881ede0858':
Delete all work fingerprints when unified lock changes to None/Swipe
Change-Id: I08b79db759838f9e34d5d8072cd035753db87408
Ricky Wai [Wed, 6 Apr 2016 14:28:28 +0000 (15:28 +0100)]
Delete all work fingerprints when unified lock changes to None/Swipe
Bug:
27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2
Ricky Wai [Thu, 7 Apr 2016 15:39:00 +0000 (15:39 +0000)]
Fingerprint should confirm device lock when unified
am:
996d0df
* commit '
996d0dfa6e42e6249853397fafe4a93e7ffeb3f3':
Fingerprint should confirm device lock when unified
Change-Id: I9d925666269a01c6b50224a1fe84ed93f632e08e
Ricky Wai [Tue, 5 Apr 2016 15:33:47 +0000 (16:33 +0100)]
Fingerprint should confirm device lock when unified
When unified and adding a fingerprint, the user is prompted to set up
a backup
Bug:
27419438
Change-Id: I6cfa8c276ae69a0af51580be390c3da4e9596874
Ricky Wai [Thu, 7 Apr 2016 14:38:22 +0000 (14:38 +0000)]
Keymaster init for work profile
am:
4bbf065
* commit '
4bbf0653c0197aca3baa587df80e76ba1159a4fb':
Keymaster init for work profile
Change-Id: I4c61e2762128fa11fbe693d3ae40937a3b9fb29d
Ricky Wai [Fri, 1 Apr 2016 15:31:56 +0000 (16:31 +0100)]
Keymaster init for work profile
Changes:
(1) When unified work challenge is enabled and screen lock is secure
- Store work profile secure key in primary profile
- When primary user keystore unlocked, unlock work profile keystore
- When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
- When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
- Remove work secure key in primary
(4) When user changes work challenge from separate to unified
- Do (1) and (2)
Bug:
27460698
Change-Id: Id7464c178e6ea7b561643477e7cd84f963048c87
Robin Lee [Thu, 7 Apr 2016 13:40:21 +0000 (13:40 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev
am:
1dea763
* commit '
1dea763d05aae89ca87ff0e59513f18ed75e6b35':
Guard double-showing of user credentials dialog
Change-Id: If2c7e62a2ca37a773af18c6c8e6a86f8e94be9c9
Robin Lee [Thu, 7 Apr 2016 13:32:52 +0000 (13:32 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev
Robin Lee [Thu, 7 Apr 2016 12:17:24 +0000 (13:17 +0100)]
Guard double-showing of user credentials dialog
Only create & show the dialogfragment if it does not already exist.
Bug:
28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
Winston Man [Thu, 7 Apr 2016 09:48:20 +0000 (09:48 +0000)]
Amend icon size for delete work profile dialog
am:
90aec18
* commit '
90aec184b4229afca5cd7ae549b49ae8f93fd1e7':
Amend icon size for delete work profile dialog
Change-Id: I7ee70923ea575aae530304472acdfd34438bd898
Winston Man [Wed, 6 Apr 2016 20:33:47 +0000 (21:33 +0100)]
Amend icon size for delete work profile dialog
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml
Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8
Bug:
27636781
Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
Nicolas Prevot [Thu, 7 Apr 2016 09:30:19 +0000 (09:30 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
am:
74777cc
* commit '
74777ccd90e8b94614ae29beb7a7e1dbadae77f0':
Ask the user to unlock the work profile before adding a work account.
Change-Id: I2c2eb6a1117e95079ac3923368d7715e90457880
Nicolas Prévot [Thu, 7 Apr 2016 09:23:18 +0000 (09:23 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
Ryoji Miyazaki [Thu, 7 Apr 2016 01:02:49 +0000 (01:02 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev
am:
90b71c6
* commit '
90b71c644de6b207fdd420893620214664dc4b44':
Fix user photo popup layout for RTL
Change-Id: Iebb04501346887829d608b7ad38e78186d03fd10
Suprabh Shukla [Thu, 7 Apr 2016 00:56:04 +0000 (00:56 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev
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"
Ryoji Miyazaki [Tue, 1 Mar 2016 06:13:36 +0000 (15:13 +0900)]
Fix user photo popup layout for RTL
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/
Bug:
27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
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
Nicolas Prevot [Wed, 6 Apr 2016 10:19:08 +0000 (11:19 +0100)]
Ask the user to unlock the work profile before adding a work account.
If the work profile is locked, and the user tries to add a
work account from Settings:
Show the work profile security challenge.
BUG:
28005200
Change-Id: I87ff25d9de94026b0d7ac307ea3a541e77989aa6
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
OSDN Git Service
