Annie Chin
34f4aa9119
Merge "Change 'red' to 'amber'" into nyc-mr1-dev am: 0ae282b26e
...
am: b2d199abd9
2016-09-23 00:26:12 +00:00
Annie Chin
30dbecc7bc
Change 'red' to 'amber' am: f980a1239c
...
am: e1ffa85984
2016-09-23 00:25:57 +00:00
Chris Tate
9c4bad92b1
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev am: 4199a0d3bd
...
am: 53cc21d189
2016-09-23 00:25:42 +00:00
Annie Chin
b2d199abd9
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
...
am: 0ae282b26e
2016-09-23 00:21:16 +00:00
Annie Chin
e1ffa85984
Change 'red' to 'amber'
...
am: f980a1239c
2016-09-23 00:21:15 +00:00
TreeHugger Robot
0ae282b26e
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
2016-09-23 00:11:08 +00:00
Christopher Tate
d35a29884b
Tell sublaunched backup settings activities about policy state am: ee564e9cfc
...
am: 8953a28597
2016-09-22 23:57:32 +00:00
Todd Kennedy
33a08271c5
Merge "Add remote control of Instant Apps" into nyc-mr1-dev am: 727186bd33
...
am: 184524b37d
2016-09-22 23:35:31 +00:00
Chris Tate
53cc21d189
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
...
am: 4199a0d3bd
2016-09-22 23:31:21 +00:00
Christopher Tate
8953a28597
Tell sublaunched backup settings activities about policy state
...
am: ee564e9cfc
2016-09-22 23:08:31 +00:00
Todd Kennedy
184524b37d
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
...
am: 727186bd33
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
212eb25768
Add remote control of Instant Apps am: 6ed0c7e8d7
...
am: d95430cbe6
2016-09-22 21:58:04 +00:00
Bill Yi
2a7e6aa6a7
Import translations. DO NOT MERGE am: b8f9eca6b2 -s ours am: 6733fd04d9 -s ours
...
am: e4591a6295
2016-09-22 21:57:23 +00:00
Bill Yi
4097006da3
Import translations. DO NOT MERGE am: 4702b22ed5 -s ours
...
am: 11a58be734
2016-09-22 21:57:06 +00:00
Todd Kennedy
d95430cbe6
Add remote control of Instant Apps
...
am: 6ed0c7e8d7
2016-09-22 20:01:03 +00:00
Bill Yi
e4591a6295
Import translations. DO NOT MERGE am: b8f9eca6b2 -s ours
...
am: 6733fd04d9
2016-09-22 19:59:25 +00:00
Bill Yi
11a58be734
Import translations. DO NOT MERGE
...
am: 4702b22ed5
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
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
5917b78ca0
Import translations. DO NOT MERGE am: 7eeb016fdd -s ours am: 4d83805999 -s ours
...
am: cacface139
2016-09-21 19:30:50 +00:00
Bill Yi
cacface139
Import translations. DO NOT MERGE am: 7eeb016fdd -s ours
...
am: 4d83805999
2016-09-21 19:28:18 +00:00
Bill Yi
4d83805999
Import translations. DO NOT MERGE
...
am: 7eeb016fdd
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
69b9c2f04c
Changes to make APN fields uneditable based on carrier config. am: 7c01344349
...
am: f3f35a9b1e
2016-09-21 02:24:38 +00:00
Amit Mahajan
f3f35a9b1e
Changes to make APN fields uneditable based on carrier config.
...
am: 7c01344349
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
3c381aec93
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am: 2c7c84a1cd am: f6e03921f8
...
am: f491f48f3c
2016-09-20 17:45:41 +00:00
Lorenzo Colitti
c2dd47e331
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am: c179f33c87 am: bd1936e9e9
...
am: f6a0fda0e5
2016-09-20 17:42:21 +00: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
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
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
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
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
f3154c6763
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c -s ours
...
am: 8469c01294
2016-09-19 18:40:56 +00:00
Bill Yi
4ebeaf09fd
Import translations. DO NOT MERGE am: a860e80b92 -s ours
...
am: 9cc0e28204
2016-09-19 18:40:36 +00:00
Bill Yi
8469c01294
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: a365d9123c
2016-09-19 18:36:50 +00:00
Bill Yi
9cc0e28204
Import translations. DO NOT MERGE
...
am: a860e80b92
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
821890c1ac
Import translations. DO NOT MERGE am: 225c634f99 -s ours am: 41e378d12c -s ours am: 9b33478680 -s ours
...
am: e281868348
2016-09-19 18:09:12 +00:00
Bill Yi
e281868348
Import translations. DO NOT MERGE am: 225c634f99 -s ours am: 41e378d12c -s ours
...
am: 9b33478680
2016-09-19 18:05:13 +00:00
