OSDN Git Service
Ricky Wai [Thu, 7 Apr 2016 16:34:04 +0000 (16:34 +0000)]
Fix work profile screen timeout policy am:
36cce83
am:
0a18f9d
* commit '
0a18f9d94ca64bff7871812c1202fd9d1cdedd8d':
Fix work profile screen timeout policy
Change-Id: Id59e79f852c2d0cd39d948c55e7e1ebd8c90bbef
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 16:02:18 +0000 (16:02 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe am:
751de37
am:
d82f072
* commit '
d82f072e0c5ac063d094d65733da4a8117a50cf5':
Delete all work fingerprints when unified lock changes to None/Swipe
Change-Id: I205a28dbbf5440d128ba6ee74ce95adad61f1806
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 [Thu, 7 Apr 2016 15:42:45 +0000 (15:42 +0000)]
Fingerprint should confirm device lock when unified am:
996d0df
am:
e9da442
* commit '
e9da44277d875ed8c1f5b3b7c411c706c7201c37':
Fingerprint should confirm device lock when unified
Change-Id: I77738befb17c89442c614f5798aff80049e95464
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:44:17 +0000 (14:44 +0000)]
Keymaster init for work profile am:
4bbf065
am:
3c6e000
* commit '
3c6e0008d605c16491e75c78951f37b77d0badc9':
Keymaster init for work profile
Change-Id: I8126a98645715199be665aa3e1f6c037d474b694
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:43:34 +0000 (13:43 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev am:
1dea763
am:
73925bf
* commit '
73925bfe5456da274617d8c3fba32d2858ca8959':
Guard double-showing of user credentials dialog
Change-Id: I21964972bd9434ae71491bf637e7b494cc2ddbae
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:51:20 +0000 (09:51 +0000)]
Amend icon size for delete work profile dialog am:
90aec18
am:
bea2dd7
* commit '
bea2dd773d40b2bcb5c317ae060b7cd5094e48b3':
Amend icon size for delete work profile dialog
Change-Id: I5f17e6cb394039b4b88de3163edd13223809027e
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 Prévot [Thu, 7 Apr 2016 09:39:22 +0000 (09:39 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev am:
74777cc
am:
195eadc
* commit '
195eadc1b080246e7cf87e9a879024246a61fbbf':
Ask the user to unlock the work profile before adding a work account.
Change-Id: I0c205d6aca59f995bc30eb22464c735890797fdf
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
Suprabh Shukla [Thu, 7 Apr 2016 01:05:36 +0000 (01:05 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev am:
90b71c6
am:
0e90766
* commit '
0e90766a5f703ca7f7a9354f4d675cffdeac5238':
Fix user photo popup layout for RTL
Change-Id: Id94327e224cf78eb26af4afc59f68703459e7477
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
Ryoji Miyazaki [Thu, 7 Apr 2016 00:58:00 +0000 (00:58 +0000)]
Merge "Fix user photo popup layout for RTL" am:
6186414 am:
d0d0af8
am:
3c51422
* commit '
3c5142206751fd2a8a8d34f07d555e56dc9e6d71':
Fix user photo popup layout for RTL
Change-Id: Iee89eb2b252c6fdf920fa84eafd538d7178f0a58
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:14:16 +0000 (00:14 +0000)]
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev am:
2006403
am:
11dcefc
* commit '
11dcefc9a87f349d1554645f23bad6d065e5ce2a':
handle devices that don't support FLASH_LOCK_STATE
Change-Id: Ic3e8ab682e2875bbf79c83878d931e305369606f
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:41:44 +0000 (21:41 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev am:
a01e2b9
am:
f312bd6
* commit '
f312bd68dadd6404c3cd86c614b6e08be7d25797':
Update fingerprint strings during setup
Change-Id: Ieb0f1fd7529754ca0a346cb0cb805fb73d0e2996
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 20:40:28 +0000 (20:40 +0000)]
Merge "Add a RecyclerView adapter for first tab in settings."
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
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: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
Fan Zhang [Thu, 24 Mar 2016 20:01:05 +0000 (13:01 -0700)]
Add a RecyclerView adapter for first tab in settings.
Bug:
27907841
The new adapter eventually will contain: conditionals, status,
suggestions.
Change-Id: I62f9db3db6557b16255ad94e2ce166b3c376e1bb
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
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: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
OSDN Git Service
