OSDN Git Service
Lorenzo Colitti [Tue, 20 Sep 2016 17:45:41 +0000 (17:45 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am:
2c7c84a1cd am:
f6e03921f8
am:
f491f48f3c
Change-Id: I181ee52b3baa28a3a0464c6599d9e30fddbca8fe
Lorenzo Colitti [Tue, 20 Sep 2016 17:42:21 +0000 (17:42 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am:
c179f33c87 am:
bd1936e9e9
am:
f6a0fda0e5
Change-Id: I6b53930533f9551e77100dba39e150735a09a3ba
Lorenzo Colitti [Tue, 20 Sep 2016 17:32:55 +0000 (17:32 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am:
2c7c84a1cd
am:
f6e03921f8
Change-Id: Ieb199e467454078e169bb03753acd35be244ad7f
Lorenzo Colitti [Tue, 20 Sep 2016 17:27:26 +0000 (17:27 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am:
c179f33c87
am:
bd1936e9e9
Change-Id: Ieab1f57e8ded33a0b3672d47ab8b03995cb35c86
Lorenzo Colitti [Tue, 20 Sep 2016 17:24:59 +0000 (17:24 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
am:
2c7c84a1cd
Change-Id: Ie98b23d5d81afffcd02fee7339dbe50172a194ae
Lorenzo Colitti [Tue, 20 Sep 2016 17:16:12 +0000 (17:16 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
am:
c179f33c87
Change-Id: Ia46300f122a19cf00f81b1f1115d8981f53fc7d9
Lorenzo Colitti [Tue, 20 Sep 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
Lorenzo Colitti [Sun, 18 Sep 2016 16:08:07 +0000 (01:08 +0900)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
Also update the settings code to reflect the new tristate
semantics of the NETWORK_AVOID_BAD_WIFI setting.
Bug:
31075769
Change-Id: Icd21d8272abe6afd42ee8a41e2c7e1a6af77f0b3
Bill Yi [Mon, 19 Sep 2016 18:40:56 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a365d9123c -s ours
am:
8469c01294 -s ours
Change-Id: I46a013fa04395eb805c3a451788b981f553b520f
Bill Yi [Mon, 19 Sep 2016 18:40:36 +0000 (18:40 +0000)]
Import translations. DO NOT MERGE am:
a860e80b92 -s ours
am:
9cc0e28204 -s ours
Change-Id: I8e19c6ac68280a665ed4436451fd05b951083bdc
Bill Yi [Mon, 19 Sep 2016 18:36:50 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
a365d9123c -s ours
Change-Id: Ie64b56ae99d4363edfbeb2d637d89abd6e356cac
Bill Yi [Mon, 19 Sep 2016 18:36:49 +0000 (18:36 +0000)]
Import translations. DO NOT MERGE
am:
a860e80b92 -s ours
Change-Id: I4050d7e0cf2c5967382acb5e8465f213f0322c5f
TreeHugger Robot [Mon, 19 Sep 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 19 Sep 2016 18:09:12 +0000 (18:09 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours am:
41e378d12c -s ours am:
9b33478680 -s ours
am:
e281868348 -s ours
Change-Id: Ic2cf855de56430d16ef1933cc1379a522dc68365
Bill Yi [Mon, 19 Sep 2016 18:05:13 +0000 (18:05 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours am:
41e378d12c -s ours
am:
9b33478680 -s ours
Change-Id: I42ad1fcf105462e8bcbabd01d09f0a440d0a7d63
Bill Yi [Mon, 19 Sep 2016 18:02:21 +0000 (18:02 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours
am:
9506876a5f -s ours
Change-Id: Ic1160814240720adc7e0cc6b61d8968e9d53fe9d
Bill Yi [Mon, 19 Sep 2016 18:02:11 +0000 (18:02 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours
am:
41e378d12c -s ours
Change-Id: I9b482638cdb3ac06afdfd03f32da3c19fdf18334
Bill Yi [Mon, 19 Sep 2016 17:58:44 +0000 (17:58 +0000)]
Import translations. DO NOT MERGE
am:
225c634f99 -s ours
Change-Id: Ibcaa7c4ec9f7ba5fc469157a524677a0f1223cfa
Bill Yi [Mon, 19 Sep 2016 17:58:43 +0000 (17:58 +0000)]
Import translations. DO NOT MERGE
am:
225c634f99 -s ours
Change-Id: I736df56414345c07d99630433996abf2819d6ece
Bill Yi [Mon, 19 Sep 2016 17:14:04 +0000 (17:14 +0000)]
Import translations. DO NOT MERGE am:
82eff79103 -s ours am:
69ca405545 -s ours
am:
4f2e73cd62 -s ours
Change-Id: I59222b09163992252c94bb23025542b8bc4e2b51
Bill Yi [Mon, 19 Sep 2016 17:10:32 +0000 (17:10 +0000)]
Import translations. DO NOT MERGE am:
82eff79103 -s ours
am:
69ca405545 -s ours
Change-Id: I7fdd07250de1e33328b722b5406c761dec56a5ec
Bill Yi [Mon, 19 Sep 2016 17:07:31 +0000 (17:07 +0000)]
Import translations. DO NOT MERGE
am:
82eff79103 -s ours
Change-Id: I56e2ce78f4d4dc4985b789b6a45c0fabaeac096f
Bill Yi [Mon, 19 Sep 2016 16:57:21 +0000 (09:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6959685436657e51d7c951d9bbc9a0c62cb8696e
Auto-generated-cl: translation import
Amit Mahajan [Mon, 19 Sep 2016 16:48:57 +0000 (16:48 +0000)]
Merge "Changes to support read-only apn types." into nyc-mr1-dev am:
9887baecf3
am:
cd49d13266
Change-Id: Ie2ec37bcb10e2cb7cae2c23c6bcf45ad015c514e
Amit Mahajan [Mon, 19 Sep 2016 16:46:05 +0000 (16:46 +0000)]
Merge "Changes to support read-only apn types." into nyc-mr1-dev
am:
9887baecf3
Change-Id: I8d0fda57fb0666d4d36be5a7dba645381ceb5c27
Amit Mahajan [Mon, 19 Sep 2016 16:41:01 +0000 (16:41 +0000)]
Changes to support read-only apn types. am:
5892792b17
am:
b56fab0270
Change-Id: I297226cff2cc7e002686a65ed02b4cea6874f827
Matthew Fritze [Mon, 19 Sep 2016 16:39:44 +0000 (16:39 +0000)]
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev am:
dcc265dcbf
am:
9cdaba3861
Change-Id: Ied27384d32ccc50c3678c6517910c633498d8ee7
Matthew Fritze [Mon, 19 Sep 2016 16:39:26 +0000 (16:39 +0000)]
Update edit text padding on Bluetooth device renaming dialog am:
68125813b2
am:
152a666154
Change-Id: Ib420ca9f6a46a4768f9caff824ccf7924b41ceac
Bill Yi [Mon, 19 Sep 2016 16:38:48 +0000 (09:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I28c47f226372a174128aeceb5d61b686e7db742b
Auto-generated-cl: translation import
Amit Mahajan [Mon, 19 Sep 2016 16:36:26 +0000 (16:36 +0000)]
Changes to support read-only apn types.
am:
5892792b17
Change-Id: I97d5045f060ac8d475fab876143230e2bea73804
Matthew Fritze [Mon, 19 Sep 2016 16:35:55 +0000 (16:35 +0000)]
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev
am:
dcc265dcbf
Change-Id: I40be92f80e15100b96576050e39699046d0f090d
Matthew Fritze [Mon, 19 Sep 2016 16:35:53 +0000 (16:35 +0000)]
Update edit text padding on Bluetooth device renaming dialog
am:
68125813b2
Change-Id: I96e7f964342c5f5b41aa9dfb6aff4e0547551a79
TreeHugger Robot [Mon, 19 Sep 2016 16:30:16 +0000 (16:30 +0000)]
Merge "Changes to support read-only apn types." into nyc-mr1-dev
Matthew Fritze [Mon, 19 Sep 2016 16:29:43 +0000 (16:29 +0000)]
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev
Bill Yi [Mon, 19 Sep 2016 15:53:13 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31075769
Change-Id: I8ed0dcd8d79e366a4f5963f1ec5b2d60346b7376
Tomohiro Takeda [Sat, 17 Sep 2016 15:55:42 +0000 (15:55 +0000)]
Merge "Fix ApplicationsState.Session memory leak in settings app" am:
00a2619a10 am:
7b357f0b55
am:
2a03d33945
Change-Id: I0e481a1aa22a94f6a0a7c32147cd4e8c87052ce2
Tomohiro Takeda [Sat, 17 Sep 2016 15:53:11 +0000 (15:53 +0000)]
Merge "Fix ApplicationsState.Session memory leak in settings app" am:
00a2619a10
am:
7b357f0b55
Change-Id: I5d7d5041c32c18c2ce50b883656cdce28daa4d93
Tomohiro Takeda [Sat, 17 Sep 2016 15:50:40 +0000 (15:50 +0000)]
Merge "Fix ApplicationsState.Session memory leak in settings app"
am:
00a2619a10
Change-Id: I2119e1d878296dae003b6283e225866155fa88b6
Treehugger Robot [Sat, 17 Sep 2016 15:45:02 +0000 (15:45 +0000)]
Merge "Fix ApplicationsState.Session memory leak in settings app"
Bill Yi [Sat, 17 Sep 2016 03:55:22 +0000 (03:55 +0000)]
Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev am:
0d00554d62 am:
5fca94ac3d
am:
324048eb24
Change-Id: Id8d82c38c3141d741722e1665ee02907e4d7d650
Paul Stewart [Sat, 17 Sep 2016 03:55:06 +0000 (03:55 +0000)]
Bad Wi-Fi: Change strings to carrier specs am:
49d703319b am:
00641d68c3
am:
e089439788
Change-Id: I894960bd05265da4f7dab8028c4fb508e8469cc1
Bill Yi [Sat, 17 Sep 2016 03:50:22 +0000 (03:50 +0000)]
Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev am:
0d00554d62
am:
5fca94ac3d
Change-Id: Ie60eacb1ae2b393bdb3325d8d986f9594080d4f1
Paul Stewart [Sat, 17 Sep 2016 03:50:06 +0000 (03:50 +0000)]
Bad Wi-Fi: Change strings to carrier specs am:
49d703319b
am:
00641d68c3
Change-Id: I12a333eeda4b90b3b20a59c55140a53a6c2b129d
Bill Yi [Sat, 17 Sep 2016 03:47:36 +0000 (03:47 +0000)]
Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev
am:
0d00554d62
Change-Id: I9397ef4575f8816da764eabf1e58e33dfa80c4af
Paul Stewart [Sat, 17 Sep 2016 03:47:35 +0000 (03:47 +0000)]
Bad Wi-Fi: Change strings to carrier specs
am:
49d703319b
Change-Id: I644d183683367280b3653750f84d9d2c9ee4c5ff
Bill Yi [Sat, 17 Sep 2016 03:39:34 +0000 (03:39 +0000)]
Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev
Bill Yi [Sat, 17 Sep 2016 03:32:35 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE am:
a4e479afec -s ours am:
a76f80c519 -s ours
am:
84c341d366 -s ours
Change-Id: If793b1c35c2abb9662cb7f49a7ffa38b990c760d
Bill Yi [Sat, 17 Sep 2016 03:30:07 +0000 (03:30 +0000)]
Import translations. DO NOT MERGE am:
a4e479afec -s ours
am:
a76f80c519 -s ours
Change-Id: I912507f92155593edbf06af0612ac91a89f67b69
Bill Yi [Sat, 17 Sep 2016 03:24:29 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE
am:
a4e479afec -s ours
Change-Id: If2e7a6470cfcf7b522d37c242e9e52acfc9a247c
Paul Stewart [Sat, 17 Sep 2016 00:48:37 +0000 (17:48 -0700)]
Bad Wi-Fi: Change strings to carrier specs
Also add a checkbox to persist the value. However, the logic to
pass this persistence to ConnectivityService has not yet been added.
Bug:
31075769
Test: Visual inspection of dialog (upcoming)
Change-Id: I370ab07ea276b024ce4adc61e10ca085be1c5549
Bill Yi [Sat, 17 Sep 2016 00:39:21 +0000 (17:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31516661
Change-Id: Idc23b872921e45152ba6c092551b6984db2073cc
Amit Mahajan [Thu, 15 Sep 2016 01:13:13 +0000 (18:13 -0700)]
Changes to support read-only apn types.
User will not be allowed to add/modify APNs for the read-only types.
Bug:
31074581
Change-Id: I954bd68249a93ce9deb0146725c1432ea6cb0f38
Hugo Benichi [Fri, 16 Sep 2016 16:53:17 +0000 (16:53 +0000)]
Add a "Cellular data fallback" pref. am:
a317684cfc am:
aabd051f50
am:
d294f58361
Change-Id: Iceca5357dab0d1a2755070f9b3b2fd7964b6e8ca
Hugo Benichi [Fri, 16 Sep 2016 16:51:11 +0000 (16:51 +0000)]
Add a "Cellular data fallback" pref. am:
a317684cfc
am:
aabd051f50
Change-Id: Iddbac3787f05e97bee559a8e991d1c2412ccbc37
Hugo Benichi [Fri, 16 Sep 2016 16:45:15 +0000 (16:45 +0000)]
Add a "Cellular data fallback" pref.
am:
a317684cfc
Change-Id: I902d4039aefddbe38a7caa20afede7af20d03086
Hugo Benichi [Fri, 16 Sep 2016 06:04:00 +0000 (15:04 +0900)]
Add a "Cellular data fallback" pref.
Also adjust working of the "lost internet" notification.
Bug:
31075769
Change-Id: I17e18516c9bfdc32b38686191327b6d6f87aed95
Noah Wang [Thu, 15 Sep 2016 19:46:33 +0000 (19:46 +0000)]
Merge "Disable accessibility focus on the instruction video in magnification gesture screen." into nyc-mr1-dev am:
131988f1ea
am:
898a35ce45
Change-Id: Ia86d07ce3bf86ee66a1d67e6d04ef59604ef71e9
Noah Wang [Thu, 15 Sep 2016 19:46:32 +0000 (19:46 +0000)]
Disable accessibility focus on the instruction video in magnification gesture screen. am:
93ec5312c5
am:
3e00d852c4
Change-Id: I322c47b86023f5ebb25b312515d69e8bbe5d08e5
Noah Wang [Thu, 15 Sep 2016 19:44:21 +0000 (19:44 +0000)]
Merge "Disable accessibility focus on the instruction video in magnification gesture screen." into nyc-mr1-dev
am:
131988f1ea
Change-Id: I934a6368af1ba29a59092a3cad8c46870e5c8455
Noah Wang [Thu, 15 Sep 2016 19:44:20 +0000 (19:44 +0000)]
Disable accessibility focus on the instruction video in magnification gesture screen.
am:
93ec5312c5
Change-Id: Ie60200fd1ced75472c24a7efbb0112fd10628e06
Noah Wang [Thu, 15 Sep 2016 19:31:24 +0000 (19:31 +0000)]
Merge "Disable accessibility focus on the instruction video in magnification gesture screen." into nyc-mr1-dev
Matthew Fritze [Thu, 15 Sep 2016 01:00:41 +0000 (18:00 -0700)]
Update edit text padding on Bluetooth device renaming dialog
Change-Id: I490452925e1b66dd3f135b14c99a7a02ba238888
Fixes:
31383112
Test: Visually inspected
Lorenzo Colitti [Thu, 15 Sep 2016 17:33:00 +0000 (17:33 +0000)]
Fix unintended modification of the NO_INTERNET dialog. am:
4753ad5902 am:
10646478f1
am:
2aa0c9396b
Change-Id: Ia2fc74f9aa673e75e39f34337c413a8f058a78a7
Lorenzo Colitti [Thu, 15 Sep 2016 17:29:45 +0000 (17:29 +0000)]
Fix unintended modification of the NO_INTERNET dialog. am:
4753ad5902
am:
10646478f1
Change-Id: I06f91c28fcce1bf737f1d11feecd95f681de8958
Noah Wang [Wed, 14 Sep 2016 23:40:05 +0000 (16:40 -0700)]
Disable accessibility focus on the instruction video in magnification
gesture screen.
Test: Manually built and tested with Bullhead
Bug:
30898790
Change-Id: I399e2b9be33ebf6dd5100705eb5f2ba5c5cc98b1
Lorenzo Colitti [Thu, 15 Sep 2016 17:20:43 +0000 (17:20 +0000)]
Fix unintended modification of the NO_INTERNET dialog.
am:
4753ad5902
Change-Id: Ib045d44acbf93ffc99d2a0545a4808ff0ad3ea58
Julia Reynolds [Thu, 15 Sep 2016 17:16:57 +0000 (17:16 +0000)]
Merge "Non-blockable notification packages can't be blocked." into nyc-mr1-dev am:
e28857ddb9
am:
3960cfb4b9
Change-Id: Ic12986ccf1f49a57fe2515ed05adf3f8ab70ae48
Julia Reynolds [Thu, 15 Sep 2016 17:16:44 +0000 (17:16 +0000)]
Non-blockable notification packages can't be blocked. am:
77b1f52574
am:
d8a033cca5
Change-Id: Ibf527a51f6f16348b8ca245685f5325cbdab31b4
Julia Reynolds [Thu, 15 Sep 2016 17:10:09 +0000 (17:10 +0000)]
Merge "Non-blockable notification packages can't be blocked." into nyc-mr1-dev
am:
e28857ddb9
Change-Id: I924ed5721fe547510e5141912330d24427c74f0e
Julia Reynolds [Thu, 15 Sep 2016 17:08:58 +0000 (17:08 +0000)]
Non-blockable notification packages can't be blocked.
am:
77b1f52574
Change-Id: I3b202fcb17e36960d97ecf10d60b99e688c9914f
Julia Reynolds [Thu, 15 Sep 2016 17:01:52 +0000 (17:01 +0000)]
Merge "Non-blockable notification packages can't be blocked." into nyc-mr1-dev
Lorenzo Colitti [Thu, 15 Sep 2016 16:17:02 +0000 (16:17 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access. am:
1449ecd460 am:
a4aa79bb69
am:
0e92ddbc1b
Change-Id: I346f3b3267c3108db8fec585a0d0b7c54934b37e
Lorenzo Colitti [Thu, 15 Sep 2016 16:10:46 +0000 (16:10 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access. am:
1449ecd460
am:
a4aa79bb69
Change-Id: I2558b419cdb5897ed8b3cd2c36c52411eab48936
Lorenzo Colitti [Thu, 15 Sep 2016 16:05:53 +0000 (16:05 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access.
am:
1449ecd460
Change-Id: I835eeb9165e726e20c26c47fb4e20fbd6d9e3f5a
Lorenzo Colitti [Thu, 15 Sep 2016 15:41:50 +0000 (00:41 +0900)]
Fix unintended modification of the NO_INTERNET dialog.
Bug:
31075769
Change-Id: I655725121aed164c2e270a6fe2ffec78a87897bd
Lorenzo Colitti [Thu, 15 Sep 2016 05:06:46 +0000 (14:06 +0900)]
Support displaying a dialog when Wi-Fi loses Internet access.
Bug:
31075769
Change-Id: Ia0c76d80591937dc40765c437e5779f3b6dde217
Salvador Martinez [Wed, 14 Sep 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev am:
d1f38f302e
am:
4e30b0458a
Change-Id: I12c1a89caf5ece1e179297f581f5e2d73439bd96
Salvador Martinez [Wed, 14 Sep 2016 20:41:04 +0000 (20:41 +0000)]
Changed information string about model am:
d92ce3ef0c
am:
878bb1e602
Change-Id: I819151689726d9f04116fe5fae7f1160dda5df2b
Salvador Martinez [Wed, 14 Sep 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev
am:
d1f38f302e
Change-Id: I4803e43fe8369a266c19a58e2955548581c15348
Salvador Martinez [Wed, 14 Sep 2016 20:38:03 +0000 (20:38 +0000)]
Changed information string about model
am:
d92ce3ef0c
Change-Id: Ia6bd630c8e273eb3613dcb5c597bd89e6de17454
TreeHugger Robot [Wed, 14 Sep 2016 20:27:53 +0000 (20:27 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev
Amin Shaikh [Wed, 14 Sep 2016 19:13:58 +0000 (19:13 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am:
1c0601b046
am:
438167c61d
Change-Id: Ibcd25fa3e77f870e32eefc291e3ddb6ea698d459
Amin Shaikh [Wed, 14 Sep 2016 19:13:57 +0000 (19:13 +0000)]
Fix crash when tapping on "Change Wallpaper". am:
f7610f0f45
am:
20022a957d
Change-Id: Iffd960c32ef2100b525d1cc276e883ffa2b0648a
Amin Shaikh [Wed, 14 Sep 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
am:
1c0601b046
Change-Id: I307d81f183ebfcc9bb1308382d8fbf357a0e6479
Amin Shaikh [Wed, 14 Sep 2016 19:11:26 +0000 (19:11 +0000)]
Fix crash when tapping on "Change Wallpaper".
am:
f7610f0f45
Change-Id: I0d321cc94af45bea0dd1dfaa82df21c4b95a8456
Amin Shaikh [Wed, 14 Sep 2016 18:52:53 +0000 (18:52 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
Salvador Martinez [Wed, 14 Sep 2016 18:27:54 +0000 (11:27 -0700)]
Changed information string about model
The string which contained the device
model information in settings was changed
to be more general. That way the model
information provided by the phone can be
more than just a number.
Test: Manual Inspection
Bug:
31108285
Change-Id: I7caf0a874983579b0e74240661b0d9b4df68bd74
Fan Zhang [Wed, 14 Sep 2016 17:55:50 +0000 (17:55 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev am:
7b7e6260f8
am:
2c9e50ed26
Change-Id: I1a612a4736e21c17eb61778f8e02c360421f19e8
Fan Zhang [Wed, 14 Sep 2016 17:35:43 +0000 (17:35 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev
am:
7b7e6260f8
Change-Id: Ie6bba0ec915035e28005b12ee6ff21285734d864
Fan Zhang [Wed, 14 Sep 2016 17:35:12 +0000 (17:35 +0000)]
Add ability to disable data warning. am:
7bd19b8891
am:
7c7a101a98
Change-Id: Ie752bc73c9034402efc478a0b1631ad7aec3934c
Rubin Xu [Wed, 14 Sep 2016 17:32:21 +0000 (17:32 +0000)]
Show approprate text when enrolling fingerprint am:
ae093e2428
am:
307767380a
Change-Id: I5cd78f269d54b0c208ccebcce686ad0e73dabf65
Fan Zhang [Wed, 14 Sep 2016 17:29:32 +0000 (17:29 +0000)]
Add ability to disable data warning.
am:
7bd19b8891
Change-Id: Ibde5eb39a32e836c2ae30f036998d19523efcd9b
Rubin Xu [Wed, 14 Sep 2016 17:29:00 +0000 (17:29 +0000)]
Show approprate text when enrolling fingerprint
am:
ae093e2428
Change-Id: I536e3bafd65461038544e6f24e35bac902d768bc
TreeHugger Robot [Wed, 14 Sep 2016 16:24:18 +0000 (16:24 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev
Fan Zhang [Mon, 12 Sep 2016 22:00:53 +0000 (15:00 -0700)]
Add ability to disable data warning.
- Add a preference to disable data warning.
- Disable data usage chart in summary page when data warning is turned
off.
Bug:
26934313
Test: Manually turned on/off data warning and inspected UI.
Test: ag/
1440361
Change-Id: I6d5b86b8502647781c52cf940f276e1969251b59
Rubin Xu [Thu, 1 Sep 2016 14:03:51 +0000 (15:03 +0100)]
Show approprate text when enrolling fingerprint
Inform the user that unlocking device by fingerprint is disabled if the
device admin has disallowed it.
Bug:
27201226
Change-Id: Id1694f07a9421ebfe3c777f2a6b624a836bff2d5
Amin Shaikh [Wed, 14 Sep 2016 05:52:15 +0000 (22:52 -0700)]
Fix crash when tapping on "Change Wallpaper".
Bug:
31306517
Change-Id: I896311917d4954f78dd689bd1a40b03e7f94284e
Fan Zhang [Tue, 13 Sep 2016 23:25:14 +0000 (23:25 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev am:
c88805713d
am:
b33ad1419a
Change-Id: Ifc74efafce9fb002265d1099977f473a7af50171
Fan Zhang [Tue, 13 Sep 2016 23:25:13 +0000 (23:25 +0000)]
Add string for set data warning. am:
d10686ff4f
am:
5a0ab072f0
Change-Id: I847b02df7c58f33bff865c7d419b168c5325d155
Fan Zhang [Tue, 13 Sep 2016 23:22:11 +0000 (23:22 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev
am:
c88805713d
Change-Id: I7f1efdeb01c4cbe2c74290411b658c6efc997c8f