Commit Graph

27942 Commits

Author SHA1 Message Date
TreeHugger Robot
0ae282b26e Merge "Change 'red' to 'amber'" into nyc-mr1-dev 2016-09-23 00:11:08 +00:00
Chris Tate
53cc21d189 Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
am: 4199a0d3bd

Change-Id: I64ccf414058dcd3488b1f5c6c32b2ca62791f778
2016-09-22 23:31:21 +00:00
Christopher Tate
8953a28597 Tell sublaunched backup settings activities about policy state
am: ee564e9cfc

Change-Id: Ia2e6482ce141ce6cc31ecd501e321b8f5454721f
2016-09-22 23:08:31 +00:00
Todd Kennedy
184524b37d Merge "Add remote control of Instant Apps" into nyc-mr1-dev
am: 727186bd33

Change-Id: Ib4e109f9780fd71c48fdd751b489ff22916864c3
2016-09-22 22:55:33 +00:00
Fan Zhang
98487f4d65 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
2016-09-22 22:13:21 +00:00
Chris Tate
4199a0d3bd Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev 2016-09-22 21:58:28 +00:00
Todd Kennedy
d95430cbe6 Add remote control of Instant Apps
am: 6ed0c7e8d7

Change-Id: If24fd101fbc4815f1eb3875fdb1216c7cee39b4b
2016-09-22 20:01:03 +00:00
Bill Yi
e4591a6295 Import translations. DO NOT MERGE am: b8f9eca6b2 -s ours
am: 6733fd04d9  -s ours

Change-Id: I865142acdd2fae0fb886a4796f0ad15a9fc4d984
2016-09-22 19:59:25 +00:00
Bill Yi
11a58be734 Import translations. DO NOT MERGE
am: 4702b22ed5  -s ours

Change-Id: I8a8a675809d8ae335f43d58ba1e83443676fd8e4
2016-09-22 19:58:29 +00:00
jackqdyulei
64e00da860 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
2016-09-22 12:53:55 -07:00
Annie Chin
f980a1239c Change 'red' to 'amber'
Change-Id: I36e4815165a12d33ce4aaad446acae19897be138
Fixes: 31628145
2016-09-22 10:26:06 -07:00
TreeHugger Robot
727186bd33 Merge "Add remote control of Instant Apps" into nyc-mr1-dev 2016-09-22 16:57:14 +00:00
Bill Yi
6733fd04d9 Import translations. DO NOT MERGE
am: b8f9eca6b2  -s ours

Change-Id: I6fe66119ad608719c03ff091e1ee04f032312788
2016-09-22 12:38:46 +00:00
Bill Yi
b8f9eca6b2 Import translations. DO NOT MERGE
Change-Id: I3f9f1416177c094f377745c6b23e878b257ccaa9
Auto-generated-cl: translation import
2016-09-22 02:12:45 -07:00
Bill Yi
4702b22ed5 Import translations. DO NOT MERGE
Change-Id: I536498782053bf9372ecc8c59c8f20727658a8ad
Auto-generated-cl: translation import
2016-09-22 02:07:48 -07:00
Christopher Tate
ee564e9cfc 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
2016-09-21 17:16:17 -07:00
Bill Yi
cacface139 Import translations. DO NOT MERGE am: 7eeb016fdd -s ours
am: 4d83805999  -s ours

Change-Id: I04ef038f38034999a033f44f4c8a9f926143fd26
2016-09-21 19:28:18 +00:00
Bill Yi
4d83805999 Import translations. DO NOT MERGE
am: 7eeb016fdd  -s ours

Change-Id: I0c3faa0ad6760b35f3a7eb8d85d0908228297b8d
2016-09-21 19:25:17 +00:00
Bill Yi
7eeb016fdd Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 31075769
Change-Id: I12e44f90e46c8f42290b7210556b52ecabcf769e
2016-09-21 12:10:51 -07:00
Amit Mahajan
f3f35a9b1e Changes to make APN fields uneditable based on carrier config.
am: 7c01344349

Change-Id: Idf1b11ac139c63abc3e1d819c98cbe664fa60f04
2016-09-21 02:11:50 +00:00
Doris Ling
08886a0e91 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
2016-09-20 16:34:04 -07:00
Amit Mahajan
7c01344349 Changes to make APN fields uneditable based on carrier config.
Bug: 30457714
Change-Id: I682445eab8eb3ff4ff3eaf036964b467217366f0
2016-09-20 15:25:26 -07:00
Lorenzo Colitti
f491f48f3c 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
2016-09-20 17:32:55 +00:00
Lorenzo Colitti
f6a0fda0e5 Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am: c179f33c87
am: bd1936e9e9

Change-Id: Ieab1f57e8ded33a0b3672d47ab8b03995cb35c86
2016-09-20 17:27:26 +00:00
Lorenzo Colitti
f6e03921f8 Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
am: 2c7c84a1cd

Change-Id: Ie98b23d5d81afffcd02fee7339dbe50172a194ae
2016-09-20 17:24:59 +00:00
Lorenzo Colitti
bd1936e9e9 Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
am: c179f33c87

Change-Id: Ia46300f122a19cf00f81b1f1115d8981f53fc7d9
2016-09-20 17:16:12 +00:00
Lorenzo Colitti
2c7c84a1cd Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev 2016-09-20 17:04:38 +00:00
Lorenzo Colitti
c179f33c87 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
2016-09-20 14:35:59 +09:00
Daniel Nishi
c0b33f70ed 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 7f075a3c41)
2016-09-19 20:39:33 +00:00
Bill Yi
8469c01294 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a365d9123c  -s ours

Change-Id: Ie64b56ae99d4363edfbeb2d637d89abd6e356cac
2016-09-19 18:36:50 +00:00
Bill Yi
9cc0e28204 Import translations. DO NOT MERGE
am: a860e80b92  -s ours

Change-Id: I4050d7e0cf2c5967382acb5e8465f213f0322c5f
2016-09-19 18:36:49 +00:00
TreeHugger Robot
a365d9123c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-19 18:30:15 +00:00
Bill Yi
e281868348 Import translations. DO NOT MERGE am: 225c634f99 -s ours am: 41e378d12c -s ours
am: 9b33478680  -s ours

Change-Id: I42ad1fcf105462e8bcbabd01d09f0a440d0a7d63
2016-09-19 18:05:13 +00:00
Bill Yi
9b33478680 Import translations. DO NOT MERGE am: 225c634f99 -s ours
am: 41e378d12c  -s ours

Change-Id: I9b482638cdb3ac06afdfd03f32da3c19fdf18334
2016-09-19 18:02:11 +00:00
Bill Yi
41e378d12c Import translations. DO NOT MERGE
am: 225c634f99  -s ours

Change-Id: I736df56414345c07d99630433996abf2819d6ece
2016-09-19 17:58:43 +00:00
Bill Yi
4f2e73cd62 Import translations. DO NOT MERGE am: 82eff79103 -s ours
am: 69ca405545  -s ours

Change-Id: I7fdd07250de1e33328b722b5406c761dec56a5ec
2016-09-19 17:10:32 +00:00
Bill Yi
69ca405545 Import translations. DO NOT MERGE
am: 82eff79103  -s ours

Change-Id: I56e2ce78f4d4dc4985b789b6a45c0fabaeac096f
2016-09-19 17:07:31 +00:00
Bill Yi
a860e80b92 Import translations. DO NOT MERGE
Change-Id: I6959685436657e51d7c951d9bbc9a0c62cb8696e
Auto-generated-cl: translation import
2016-09-19 09:57:21 -07:00
Amit Mahajan
cd49d13266 Merge "Changes to support read-only apn types." into nyc-mr1-dev
am: 9887baecf3

Change-Id: I8d0fda57fb0666d4d36be5a7dba645381ceb5c27
2016-09-19 16:46:05 +00:00
Bill Yi
225c634f99 Import translations. DO NOT MERGE
Change-Id: I28c47f226372a174128aeceb5d61b686e7db742b
Auto-generated-cl: translation import
2016-09-19 09:38:48 -07:00
Amit Mahajan
b56fab0270 Changes to support read-only apn types.
am: 5892792b17

Change-Id: I97d5045f060ac8d475fab876143230e2bea73804
2016-09-19 16:36:26 +00:00
Matthew Fritze
9cdaba3861 Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev
am: dcc265dcbf

Change-Id: I40be92f80e15100b96576050e39699046d0f090d
2016-09-19 16:35:55 +00:00
Matthew Fritze
152a666154 Update edit text padding on Bluetooth device renaming dialog
am: 68125813b2

Change-Id: I96e7f964342c5f5b41aa9dfb6aff4e0547551a79
2016-09-19 16:35:53 +00:00
TreeHugger Robot
9887baecf3 Merge "Changes to support read-only apn types." into nyc-mr1-dev 2016-09-19 16:30:17 +00:00
Matthew Fritze
dcc265dcbf Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev 2016-09-19 16:29:44 +00:00
Bill Yi
82eff79103 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 31075769
Change-Id: I8ed0dcd8d79e366a4f5963f1ec5b2d60346b7376
2016-09-19 08:53:13 -07:00
Bill Yi
324048eb24 Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev am: 0d00554d62
am: 5fca94ac3d

Change-Id: Ie60eacb1ae2b393bdb3325d8d986f9594080d4f1
2016-09-17 03:50:22 +00:00
Paul Stewart
e089439788 Bad Wi-Fi: Change strings to carrier specs am: 49d703319b
am: 00641d68c3

Change-Id: I12a333eeda4b90b3b20a59c55140a53a6c2b129d
2016-09-17 03:50:06 +00:00
Bill Yi
5fca94ac3d Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev
am: 0d00554d62

Change-Id: I9397ef4575f8816da764eabf1e58e33dfa80c4af
2016-09-17 03:47:36 +00:00
Paul Stewart
00641d68c3 Bad Wi-Fi: Change strings to carrier specs
am: 49d703319b

Change-Id: I644d183683367280b3653750f84d9d2c9ee4c5ff
2016-09-17 03:47:35 +00:00