OSDN Git Service
Fan Zhang [Fri, 23 Sep 2016 23:37:49 +0000 (23:37 +0000)]
Fix NPE when trying to refreshes dnd condition.
am:
98487f4d65
Change-Id: I27d984f6ebb1de4832d819a843c9cdbfeeabeaf8
Daniel Nishi [Fri, 23 Sep 2016 22:41:15 +0000 (22:41 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev
am:
3843dd96f5
Change-Id: I6912a4d634152d40a9af1ab98f2303ec8288e55f
Daniel Nishi [Fri, 23 Sep 2016 22:31:34 +0000 (22:31 +0000)]
Use a config flag instead of a RO flag for showing Manage Storage.
am:
c0b33f70ed
Change-Id: I5b178d6e345ecc43689e0e1b5d6102e60b33037a
Daniel Nishi [Fri, 23 Sep 2016 22:19:11 +0000 (22:19 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev
Doris Ling [Fri, 23 Sep 2016 19:07:21 +0000 (19:07 +0000)]
Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev
am:
2dc974a648
Change-Id: Ia06f96e479d3282e11644cbbc40e5945d9ee215c
Doris Ling [Fri, 23 Sep 2016 19:07:19 +0000 (19:07 +0000)]
Use default switch preference view if gesture animations video is not available.
am:
08886a0e91
Change-Id: I813a7b61b49c593d639621194d1e0929a2322605
Doris Ling [Fri, 23 Sep 2016 18:49:05 +0000 (18:49 +0000)]
Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev
Lei Yu [Fri, 23 Sep 2016 16:34:55 +0000 (16:34 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev
am:
a985425e98
Change-Id: I63577db8f2ca7c8eea0a2b3b7220c4db4d5bf76f
jackqdyulei [Fri, 23 Sep 2016 16:34:54 +0000 (16:34 +0000)]
Set preference unselectable using the DividerPreference.
am:
64e00da860
Change-Id: Ie202ee30067761ca7025ff37c3779052c48cacd5
Lei Yu [Fri, 23 Sep 2016 16:29:00 +0000 (16:29 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev
Annie Chin [Fri, 23 Sep 2016 00:21:16 +0000 (00:21 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
am:
0ae282b26e
Change-Id: I869ecadaf6cc42d076f1d6368f64ef6e0d521bca
Annie Chin [Fri, 23 Sep 2016 00:21:15 +0000 (00:21 +0000)]
Change 'red' to 'amber'
am:
f980a1239c
Change-Id: I8c55a1cc67024be79922e9f931ea8e631a790615
TreeHugger Robot [Fri, 23 Sep 2016 00:11:07 +0000 (00:11 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
Chris Tate [Thu, 22 Sep 2016 23:31:21 +0000 (23:31 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
am:
4199a0d3bd
Change-Id: I64ccf414058dcd3488b1f5c6c32b2ca62791f778
Christopher Tate [Thu, 22 Sep 2016 23:08:31 +0000 (23:08 +0000)]
Tell sublaunched backup settings activities about policy state
am:
ee564e9cfc
Change-Id: Ia2e6482ce141ce6cc31ecd501e321b8f5454721f
Todd Kennedy [Thu, 22 Sep 2016 22:55:33 +0000 (22:55 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
am:
727186bd33
Change-Id: Ib4e109f9780fd71c48fdd751b489ff22916864c3
Fan Zhang [Thu, 22 Sep 2016 22:10:40 +0000 (15:10 -0700)]
Fix NPE when trying to refreshes dnd condition.
Bug:
31685838
Test: manual, will add automated test in master.
The NPE happens when try to refresh dnd condition before the condition
object is created.
Change-Id: Idbd6898472e1ad21a2bbb3be5f0b9c24c03b5c80
Chris Tate [Thu, 22 Sep 2016 21:58:27 +0000 (21:58 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
Todd Kennedy [Thu, 22 Sep 2016 20:01:03 +0000 (20:01 +0000)]
Add remote control of Instant Apps
am:
6ed0c7e8d7
Change-Id: If24fd101fbc4815f1eb3875fdb1216c7cee39b4b
Bill Yi [Thu, 22 Sep 2016 19:59:25 +0000 (19:59 +0000)]
Import translations. DO NOT MERGE am:
b8f9eca6b2 -s ours
am:
6733fd04d9 -s ours
Change-Id: I865142acdd2fae0fb886a4796f0ad15a9fc4d984
Bill Yi [Thu, 22 Sep 2016 19:58:29 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
4702b22ed5 -s ours
Change-Id: I8a8a675809d8ae335f43d58ba1e83443676fd8e4
jackqdyulei [Wed, 31 Aug 2016 21:17:26 +0000 (14:17 -0700)]
Set preference unselectable using the DividerPreference.
In this way, when talking back is on, device won't speaking "Double
tap to activate" for no-action perference. The preference will have
divider line but lose ripple animation.
Bug:
31051833
Test: Manual Test. Cannot find a way to test it in testing framework.
1. Turn on the talk back.
2. Go to "About phone" Settings.
3. Tap and listen.
Change-Id: I2066d574e14071408c5a1db85a3bd4dafd8429fe
Annie Chin [Thu, 22 Sep 2016 17:26:06 +0000 (10:26 -0700)]
Change 'red' to 'amber'
Change-Id: I36e4815165a12d33ce4aaad446acae19897be138
Fixes:
31628145
TreeHugger Robot [Thu, 22 Sep 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
Bill Yi [Thu, 22 Sep 2016 12:38:46 +0000 (12:38 +0000)]
Import translations. DO NOT MERGE
am:
b8f9eca6b2 -s ours
Change-Id: I6fe66119ad608719c03ff091e1ee04f032312788
Bill Yi [Thu, 22 Sep 2016 09:12:45 +0000 (02:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f9f1416177c094f377745c6b23e878b257ccaa9
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 09:07:48 +0000 (02:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I536498782053bf9372ecc8c59c8f20727658a8ad
Auto-generated-cl: translation import
Christopher Tate [Thu, 22 Sep 2016 00:16:17 +0000 (17:16 -0700)]
Tell sublaunched backup settings activities about policy state
Policy state is not readily observable by subsidiary UI, so we
now tell it explicitly when sublaunching it.
Bug
30126678
Change-Id: Icdd6e39874070d7337b4b0a0d5b80c52bb3e7e40
Bill Yi [Wed, 21 Sep 2016 19:28:18 +0000 (19:28 +0000)]
Import translations. DO NOT MERGE am:
7eeb016fdd -s ours
am:
4d83805999 -s ours
Change-Id: I04ef038f38034999a033f44f4c8a9f926143fd26
Bill Yi [Wed, 21 Sep 2016 19:25:17 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am:
7eeb016fdd -s ours
Change-Id: I0c3faa0ad6760b35f3a7eb8d85d0908228297b8d
Bill Yi [Wed, 21 Sep 2016 19:10:51 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31075769
Change-Id: I12e44f90e46c8f42290b7210556b52ecabcf769e
Amit Mahajan [Wed, 21 Sep 2016 02:11:50 +0000 (02:11 +0000)]
Changes to make APN fields uneditable based on carrier config.
am:
7c01344349
Change-Id: Idf1b11ac139c63abc3e1d819c98cbe664fa60f04
Doris Ling [Fri, 16 Sep 2016 23:58:02 +0000 (16:58 -0700)]
Use default switch preference view if gesture animations video is not
available.
Check to see if animation video is available. If so, use the customized
view. Otherwise, use the default switch preference layout.
Test: make and run SettingsGoogleTests
Bug:
30701118
Change-Id: I0b25f41f8425b92834b45f706690648fb35a885d
Amit Mahajan [Tue, 20 Sep 2016 17:59:16 +0000 (10:59 -0700)]
Changes to make APN fields uneditable based on carrier config.
Bug:
30457714
Change-Id: I682445eab8eb3ff4ff3eaf036964b467217366f0
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
Daniel Nishi [Fri, 9 Sep 2016 00:24:50 +0000 (17:24 -0700)]
Use a config flag instead of a RO flag for showing Manage Storage.
Bug:
30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
(cherry picked from commit
7f075a3c41f02d58bae10fb3f2b4a4ad8ada8967)
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: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: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:43 +0000 (17:58 +0000)]
Import translations. DO NOT MERGE
am:
225c634f99 -s ours
Change-Id: I736df56414345c07d99630433996abf2819d6ece
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:46:05 +0000 (16:46 +0000)]
Merge "Changes to support read-only apn types." into nyc-mr1-dev
am:
9887baecf3
Change-Id: I8d0fda57fb0666d4d36be5a7dba645381ceb5c27
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
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: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: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
Todd Kennedy [Tue, 13 Sep 2016 23:36:25 +0000 (16:36 -0700)]
Add remote control of Instant Apps
Bug:
31470039
Test: manual
Change-Id: I82eb47f4d24fb88d0f264eca1176aec55364867c
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: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: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: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: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: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: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: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