OSDN Git Service
Nathan Harold [Tue, 22 Mar 2016 02:27:18 +0000 (02:27 +0000)]
Fix Crash in the WiFi Status Test Menu am:
582b287
am:
19acb87
* commit '
19acb87506e4bc14d611fd323c75e5ccaadf142c':
Fix Crash in the WiFi Status Test Menu
Nathan Harold [Tue, 22 Mar 2016 02:24:29 +0000 (02:24 +0000)]
Fix Crash in the WiFi Status Test Menu
am:
582b287
* commit '
582b28759551413454a7bf3e5e9e919030ceca33':
Fix Crash in the WiFi Status Test Menu
Nathan Harold [Mon, 21 Mar 2016 22:13:31 +0000 (15:13 -0700)]
Fix Crash in the WiFi Status Test Menu
-Remove fragments of the defunct/removed ip-address ping test
-Update a dangling resource reference
Bug:
27771038
Change-Id: Ib26eb6427eb6fbe6ef2d1f235277af3d2e8093f1
Tony Mak [Mon, 21 Mar 2016 15:28:15 +0000 (15:28 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am:
147fa9f
am:
1a7d856
* commit '
1a7d8569840c23099bf39aadc990640f916ef516':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
Victor Chang [Mon, 21 Mar 2016 15:28:15 +0000 (15:28 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev am:
32da1ec
am:
d0fc82f
* commit '
d0fc82fd66477a14e2f3edf646fd51321c7fa935':
Per vpn setting change in VPN list
Tony Mak [Mon, 21 Mar 2016 15:25:39 +0000 (15:25 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
am:
147fa9f
* commit '
147fa9f542a5509f64009548af221729a66138f5':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
Victor Chang [Mon, 21 Mar 2016 15:25:39 +0000 (15:25 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev
am:
32da1ec
* commit '
32da1ecdca5e447268da5166f4a020ff9b54ab44':
Per vpn setting change in VPN list
Tony Mak [Mon, 21 Mar 2016 15:20:34 +0000 (15:20 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
Victor Chang [Mon, 21 Mar 2016 15:20:13 +0000 (15:20 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:54:49 +0000 (14:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
6aad5a1 -s ours
am:
6c1a8ae -s ours
* commit '
6c1a8ae669dfc762bca0230ab7a7d82d2601c279':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Mar 2016 14:52:33 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
6aad5a1 -s ours
* commit '
6aad5a1bda4ca018cf9afd6afb982d7646a619de':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Mar 2016 14:41:09 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:40:16 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie958cde80e3f06203380e8f77f67faff9259bd6b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Mar 2016 13:47:05 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 21 Mar 2016 13:31:50 +0000 (06:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85c85f558c3aa45ea3242df019597b1cedaf17d7
Auto-generated-cl: translation import
Victor Chang [Mon, 21 Mar 2016 13:18:51 +0000 (13:18 +0000)]
Merge "Vpn settings per vpn" into nyc-dev am:
df21cc7
am:
dcb3f2f
* commit '
dcb3f2f3fd0ad10effee66ec8f55416fff61318a':
Vpn settings per vpn
Victor Chang [Mon, 21 Mar 2016 13:16:29 +0000 (13:16 +0000)]
Merge "Vpn settings per vpn" into nyc-dev
am:
df21cc7
* commit '
df21cc7de9a6c5543095b0b9eca476b1ff853982':
Vpn settings per vpn
Victor Chang [Mon, 21 Mar 2016 13:09:07 +0000 (13:09 +0000)]
Merge "Vpn settings per vpn" into nyc-dev
Victor Chang [Tue, 15 Mar 2016 18:48:08 +0000 (18:48 +0000)]
Per vpn setting change in VPN list
- Show admin support details when user taps on a cell and user restriction is on
- Show always-on-vpn active status in preference summary
- User can still open non-configurable per-VPN info page even when user restriction is applied
- Rename ConfigPreference to LegacyVpnPreference
- Move summary String handling into ManageablePreference
- ManageablePreference inherits GearPreference to reuse the code
- Don't show disconnect dialog when always-on is enabled
BUG=
26950700
Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f
Victor Chang [Fri, 11 Mar 2016 19:44:56 +0000 (19:44 +0000)]
Vpn settings per vpn
This CL adds a setting for each VPN
- When no_config_vpn user restriction is applied, user can't change anything in the page
- Launch the subsetting activity in the corresponding user to unlock keystore and force work challenge
- Show dialog when user replace always-on-VPN package
- When forget VPN, unset always-on-vpn
TODO: show per-VPN status in VPN list
Change-Id: Ica360ea44117db6a4ecfaed1eec6c188189c246c
Mahaver Chopra [Mon, 21 Mar 2016 11:20:17 +0000 (11:20 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev am:
ad1b7f6
am:
a4474c7
* commit '
a4474c7286e3b8386589031d2bd6bd6b336db641':
User should confirm device lock before un-unifying
Mahaver Chopra [Mon, 21 Mar 2016 11:17:58 +0000 (11:17 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev
am:
ad1b7f6
* commit '
ad1b7f611310513b7dac74ffaff929c745126f44':
User should confirm device lock before un-unifying
Clara Bayarri [Mon, 21 Mar 2016 11:12:20 +0000 (11:12 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 03:57:40 +0000 (03:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 19 Mar 2016 03:52:22 +0000 (20:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia02626660408f6f177ca4d052cbc03eb26c0a871
Auto-generated-cl: translation import
Geoff Mendal [Sat, 19 Mar 2016 03:24:34 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am:
5f96b25 -s ours
am:
670a9c7 -s ours
* commit '
670a9c7b9820fa7c087a9006c3e5d7ced78b405a':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 03:21:56 +0000 (03:21 +0000)]
Import translations. DO NOT MERGE
am:
5f96b25 -s ours
* commit '
5f96b25dae8092ed5173ae89948515f1c2848f6f':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 03:17:38 +0000 (04:17 +0100)]
Import translations. DO NOT MERGE
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
Anna Galusza [Fri, 18 Mar 2016 21:44:24 +0000 (21:44 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791" into nyc-dev am:
e9b5d59
am:
77e429b
* commit '
77e429b27e24ff825053e48422b40b99aa9e73bd':
Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791
Anna Galusza [Fri, 18 Mar 2016 21:41:30 +0000 (21:41 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791" into nyc-dev
am:
e9b5d59
* commit '
e9b5d5980bb6b6fab60c1224375201dc31fafc8b':
Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791
Anna Galusza [Fri, 18 Mar 2016 21:32:52 +0000 (21:32 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791" into nyc-dev
Mahaver Chopra [Fri, 18 Mar 2016 19:08:05 +0000 (19:08 +0000)]
User should confirm device lock before un-unifying
User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.
Bug:
26815727
Bug:
27523804
Bug:
27547551
Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7
Tony Mak [Fri, 18 Mar 2016 18:57:00 +0000 (18:57 +0000)]
Merge "Should read specific user\'s password restriction" into nyc-dev am:
2bfbcfa
am:
d1af8c2
* commit '
d1af8c2d6ac6ea858e67022ff76a0f938bfc5ad4':
Should read specific user's password restriction
Tony Mak [Fri, 18 Mar 2016 18:57:00 +0000 (18:57 +0000)]
Clear mHasResult if the result is dispatched am:
b27d5b2
am:
b03e5ec
* commit '
b03e5ece2d4e27bccc681404ed755d7ce4908559':
Clear mHasResult if the result is dispatched
Tony Mak [Fri, 18 Mar 2016 18:54:45 +0000 (18:54 +0000)]
Merge "Should read specific user\'s password restriction" into nyc-dev
am:
2bfbcfa
* commit '
2bfbcfae13afd00b7e7e28031a9bda5f7de753f8':
Should read specific user's password restriction
Tony Mak [Fri, 18 Mar 2016 18:54:45 +0000 (18:54 +0000)]
Clear mHasResult if the result is dispatched
am:
b27d5b2
* commit '
b27d5b2007020e9911aaab57161bced168d3b99c':
Clear mHasResult if the result is dispatched
Tony Mak [Fri, 18 Mar 2016 18:51:58 +0000 (18:51 +0000)]
Merge "Should read specific user's password restriction" into nyc-dev
Tony Mak [Fri, 18 Mar 2016 18:24:13 +0000 (18:24 +0000)]
Clear mHasResult if the result is dispatched
The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.
Bug:
27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85
Jason Monk [Fri, 18 Mar 2016 18:22:03 +0000 (18:22 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev am:
b56d3a6
am:
87e213b
* commit '
87e213b8dfc95e7aef880142aa58061606049975':
Fix bluetooth device forgetting
Jason Monk [Fri, 18 Mar 2016 18:19:47 +0000 (18:19 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev
am:
b56d3a6
* commit '
b56d3a6c33f9d548247cbf8ed4894a3f4227b0e5':
Fix bluetooth device forgetting
Jason Monk [Fri, 18 Mar 2016 18:13:47 +0000 (18:13 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev
Jason Monk [Fri, 18 Mar 2016 18:11:25 +0000 (14:11 -0400)]
Fix bluetooth device forgetting
Bug:
27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc
Anna Galusza [Fri, 18 Mar 2016 17:18:36 +0000 (10:18 -0700)]
Stops black screen from being displayed on changing Vision Settings in SUW.
Bug:
27328791
Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc
mariagpuyol [Fri, 18 Mar 2016 15:46:36 +0000 (15:46 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev am:
db15d8e
am:
251e7dc
* commit '
251e7dc99667f7bf4760988113f0260e9fd96b67':
Remove emergency info subtitle
mariagpuyol [Fri, 18 Mar 2016 15:43:57 +0000 (15:43 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev
am:
db15d8e
* commit '
db15d8e21b54d9a0e57c2e5dca756cc306ee78ff':
Remove emergency info subtitle
Abodunrinwa Toki [Fri, 18 Mar 2016 15:41:40 +0000 (15:41 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev am:
4873230
am:
153ce15
* commit '
153ce15c311a1daf9ddf03f4c1ae9b393e12c6c7':
Work challenge background: Fix top padding
Maria Garcia Puyol [Fri, 18 Mar 2016 15:37:58 +0000 (15:37 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev
Abodunrinwa Toki [Fri, 18 Mar 2016 15:37:08 +0000 (15:37 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev
am:
4873230
* commit '
487323032638e733d9cec4608838b7727b99232f':
Work challenge background: Fix top padding
Abodunrinwa Toki [Fri, 18 Mar 2016 15:30:01 +0000 (15:30 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev
mariagpuyol [Fri, 18 Mar 2016 15:11:04 +0000 (08:11 -0700)]
Remove emergency info subtitle
Bug:
27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
Maria Garcia Puyol [Fri, 18 Mar 2016 15:12:11 +0000 (15:12 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev am:
c35b08b
am:
2aca50b
* commit '
2aca50b6579a57603275e4a65843617ee7e9c855':
Revert "Dialog for emergency info"
Maria Garcia Puyol [Fri, 18 Mar 2016 15:09:53 +0000 (15:09 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev
am:
c35b08b
* commit '
c35b08b4b3de8daebbc6974715dbc4a0d4a91c1e':
Revert "Dialog for emergency info"
Maria Garcia Puyol [Fri, 18 Mar 2016 15:06:02 +0000 (15:06 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev
Tony Mak [Fri, 18 Mar 2016 13:48:16 +0000 (13:48 +0000)]
Should read specific user's password restriction
Bug:
27330307
Bug:
27543548
Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
Philip P. Moltmann [Fri, 18 Mar 2016 14:37:41 +0000 (14:37 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev am:
47a9d4f
am:
f9f4429
* commit '
f9f4429f80f168422509b9c1b6f9126780fdd34e':
Correctly compose activity name of add-printer and print-settings activity
Philip P. Moltmann [Fri, 18 Mar 2016 14:32:43 +0000 (14:32 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
am:
47a9d4f
* commit '
47a9d4f70c21cb8b19af5699fb9522668dc0fb6a':
Correctly compose activity name of add-printer and print-settings activity
Ricky Wai [Fri, 18 Mar 2016 14:30:53 +0000 (14:30 +0000)]
Fix location settings crash when work profile is disabled am:
3bd4771
am:
b8e660b
* commit '
b8e660b62f58dd4056cea2c4f93a81b39b6302ec':
Fix location settings crash when work profile is disabled
Ricky Wai [Fri, 18 Mar 2016 14:30:52 +0000 (14:30 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev am:
ff99bae
am:
89d419e
* commit '
89d419eb37d7b64fabd94189b3059699a117af1e':
Do not connect to KeyChainService when user is not started
Ricky Wai [Fri, 18 Mar 2016 14:26:26 +0000 (14:26 +0000)]
Fix location settings crash when work profile is disabled
am:
3bd4771
* commit '
3bd4771ccb6f05c30cf7de6b2092f4f580821b56':
Fix location settings crash when work profile is disabled
Ricky Wai [Fri, 18 Mar 2016 14:26:26 +0000 (14:26 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
am:
ff99bae
* commit '
ff99bae74452e62249da336744637d8517448e5c':
Do not connect to KeyChainService when user is not started
Philip P. Moltmann [Fri, 18 Mar 2016 14:26:25 +0000 (14:26 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
Ricky Wai [Fri, 11 Mar 2016 09:06:02 +0000 (09:06 +0000)]
Fix location settings crash when work profile is disabled
Bug:
27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69
Ricky Wai [Fri, 18 Mar 2016 14:16:27 +0000 (14:16 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
Ricky Wai [Fri, 11 Mar 2016 07:09:24 +0000 (07:09 +0000)]
Do not connect to KeyChainService when user is not started
Bug:
27418671
Change-Id: Id1bca405e8b0ebea79726f623aaa0c59bce0331c
Tony Mak [Fri, 18 Mar 2016 12:20:28 +0000 (12:20 +0000)]
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
The problem is because ConfirmDeviceCredentialActivity is not created
again when the new intent is fired. Add no history flag to kill it once
it is not visible. We have the exclude from recent flag anyway, so
finishing it should be fine.
Bug:
27564634
Change-Id: I2e22f3d7a108f8fbad5f27894b1a92f19d25bcda
Maria Garcia Puyol [Thu, 17 Mar 2016 22:52:44 +0000 (22:52 +0000)]
Revert "Dialog for emergency info"
This reverts commit
ae49edbdfd79c3ccc2ae135690a35f4d57c8aaed.
Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
Jeff Sharkey [Thu, 17 Mar 2016 22:18:16 +0000 (22:18 +0000)]
Merge "Follow framework refactoring." into nyc-dev am:
297ce9a
am:
2758b99
* commit '
2758b99e9d1ea7cec97e7c92ddc668ec5e4b0d84':
Follow framework refactoring.
Jeff Sharkey [Thu, 17 Mar 2016 22:14:09 +0000 (22:14 +0000)]
Merge "Follow framework refactoring." into nyc-dev
am:
297ce9a
* commit '
297ce9aaf396ab35f28d6c84ad0b3f040494aaf9':
Follow framework refactoring.
Jeff Sharkey [Thu, 17 Mar 2016 22:00:21 +0000 (22:00 +0000)]
Merge "Follow framework refactoring." into nyc-dev
Sudheer Shanka [Thu, 17 Mar 2016 21:52:22 +0000 (21:52 +0000)]
Merge "Fix string typo." into nyc-dev am:
d0145cc
am:
feed83f
* commit '
feed83f7a38524aedbbb959e5362ee611ce67500':
Fix string typo.
Sudheer Shanka [Thu, 17 Mar 2016 21:49:50 +0000 (21:49 +0000)]
Merge "Fix string typo." into nyc-dev
am:
d0145cc
* commit '
d0145cc87a0eb2210022793f9d8aaf7f0462fcf9':
Fix string typo.
Xiaohui Chen [Thu, 17 Mar 2016 21:45:07 +0000 (21:45 +0000)]
Merge "fix build for ag/887244" into nyc-dev am:
e7359ee
am:
a4da112
* commit '
a4da11246febcf2710c4abe9b788cad0c37249f4':
fix build for ag/887244
Xiaohui Chen [Thu, 17 Mar 2016 21:42:23 +0000 (21:42 +0000)]
Merge "fix build for ag/887244" into nyc-dev
am:
e7359ee
* commit '
e7359eee4c3dad9a5acf98ff61c9801dd13d2e8c':
fix build for ag/887244
Sudheer Shanka [Thu, 17 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Fix string typo." into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 21:37:19 +0000 (21:37 +0000)]
Merge "fix build for ag/887244" into nyc-dev
Anna Galusza [Thu, 17 Mar 2016 21:30:39 +0000 (21:30 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug:
27066012" into nyc-dev am:
a6b76bc
am:
a7df8a7
* commit '
a7df8a7c1bfd14a3b7672fe36e2b391d1014146f':
Add divider below summary text on A11y SUW hub. Bug:
27066012
Anna Galusza [Thu, 17 Mar 2016 21:27:42 +0000 (21:27 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug:
27066012" into nyc-dev
am:
a6b76bc
* commit '
a6b76bc4071c2946d0e809e72552cb1909b264ae':
Add divider below summary text on A11y SUW hub. Bug:
27066012
Anna Galusza [Thu, 17 Mar 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug:
27066012" into nyc-dev
Anna Galusza [Thu, 17 Mar 2016 19:55:14 +0000 (12:55 -0700)]
Add divider below summary text on A11y SUW hub.
Bug:
27066012
Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
Xiaohui Chen [Thu, 17 Mar 2016 20:38:01 +0000 (13:38 -0700)]
fix build for ag/887244
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
Sudheer Shanka [Thu, 17 Mar 2016 20:18:32 +0000 (13:18 -0700)]
Fix string typo.
Bug:
27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
Udam Saini [Thu, 17 Mar 2016 20:09:06 +0000 (20:09 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev am:
4c173cb
am:
2607f55
* commit '
2607f5516cd6d8fcdc458cc65bb9ccc1a86ded02':
Sets the divider style to either for fingerprint.
Udam Saini [Thu, 17 Mar 2016 20:06:47 +0000 (20:06 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev
am:
4c173cb
* commit '
4c173cb46effd9d932ebdfb9c1c634edb5bee19d':
Sets the divider style to either for fingerprint.
Udam Saini [Thu, 17 Mar 2016 19:59:52 +0000 (19:59 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)]
Merge "Fix build" into nyc-dev am:
7c80241
am:
f9c21c2
* commit '
f9c21c28a3928bb28ebd46eb0e2cf288b4ac4e05':
Fix build
Mahaver Chopra [Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)]
Merge "Title text and input bar should be white" into nyc-dev am:
bef02df
am:
36e4e7a
* commit '
36e4e7ac10ede26bfb9949b6e04851d428f67337':
Title text and input bar should be white
Mahaver Chopra [Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)]
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev am:
78a4bcd
am:
0ed1e25
* commit '
0ed1e25a2218322fe6672c0752fed30cf80d0483':
Work Profile Security Challenge: Finalised strings
Julia Reynolds [Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)]
Merge "Fix crash adding an account." into nyc-dev am:
f6fb21c
am:
1e148a3
* commit '
1e148a30941c8011c0ad2a78aad0c0e0f2182e22':
Fix crash adding an account.
Jason Monk [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev am:
e580f94
am:
8dd1b68
* commit '
8dd1b68b6ff4f18cdf0c0e4a010e3add69aed85b':
Fix battery history detail up
Fix clickability of conditionals
Try to recycle prefs in battery summary
Don't use animations for security settings
Fix Settings home lifecycle
Robin Lee [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
vpn: check fragment is visible before adding prefs am:
37b179f
am:
64de61e
* commit '
64de61e683e2ffa77242d14ce5c681e38adc51ee':
vpn: check fragment is visible before adding prefs
Daichi Hirono [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev am:
23f4261
am:
9ed9d94
* commit '
9ed9d94ab50f03f6f3500689a78707c8d567c3a4':
Use CheckableLinearLayout for Use USB for dialog's item.
Yohei Yukawa [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Stop using a deprecated constructor of InputMethodSettings. am:
143a686
am:
9452632
* commit '
9452632d23b95654cb942f391f06a32132943e27':
Stop using a deprecated constructor of InputMethodSettings.
Meng Wang [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev am:
2ccf1fd
am:
96f2194
* commit '
96f21944801c7a38c6d75ca8927f13eb1560b27e':
Show ICCID in SIM status, if CarrierConfigManager allows.
Robin Lee [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev am:
d0979a5
am:
8af9a74
* commit '
8af9a7452948be260ac6fcb7f0230b0f347a6aee':
Show "no vpns added" for empty vpn screen
Christopher Tate [Thu, 17 Mar 2016 19:32:35 +0000 (19:32 +0000)]
Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev am:
8b90b39
am:
ecd0f41
* commit '
ecd0f417efdda8a4ff18f60733be3813285c3dff':
Don't crash if the backup transport supplies bogus intents
Abodunrinwa Toki [Thu, 17 Mar 2016 18:48:05 +0000 (18:48 +0000)]
Work challenge background: Fix top padding
Bug:
27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
Julia Reynolds [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Fix build" into nyc-dev
am:
7c80241
* commit '
7c802419fd99445442cb7499757dbcadda18fee0':
Fix build
Mahaver Chopra [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Title text and input bar should be white" into nyc-dev
am:
bef02df
* commit '
bef02df556fd4ea09c416025b67e6769b25a6c4a':
Title text and input bar should be white
Mahaver Chopra [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
am:
78a4bcd
* commit '
78a4bcd4196450d245adebec15aaae2be2778493':
Work Profile Security Challenge: Finalised strings
Julia Reynolds [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Fix crash adding an account." into nyc-dev
am:
f6fb21c
* commit '
f6fb21c44d1b138c28bdd057c7b83e35f62a432b':
Fix crash adding an account.
OSDN Git Service
