Daniel Nishi
db1158f855
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
...
am: b27d65fa55
2017-08-01 23:18:57 +00:00
Fan Zhang
defb1183ec
Remove code for old wifi tether feature
...
Change-Id: If92798ddf075801e66cd97ecacff2f8df1e41985
Fix: 64032458
Test: rerun robotests
2017-08-01 16:18:24 -07:00
Daniel Nishi
b27d65fa55
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
2017-08-01 23:11:18 +00:00
Malcolm Chen
33005caf42
In the “Data usage” subtext, remove the word “between”.
...
Bug: 64072976
Test: manual
Change-Id: I8720f0cf84270d2e8b50547188e48478b889ec81
2017-08-01 15:55:32 -07:00
Fan Zhang
ac06e1eeae
Convert app storage page to use generic ActionButtonPref
...
Change-Id: I2154bbbc5c78fe313b22f1d66229d6da7586279f
Fix: 63991885
Test: robotests
2017-08-01 15:51:33 -07:00
TreeHugger Robot
11879690cd
Merge "Import translations. DO NOT MERGE"
2017-08-01 22:11:15 +00:00
Bill Yi
a061b814ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4f368a3acc -s ours
...
am: 7f5b5f391d
2017-08-01 21:39:48 +00:00
Fan Zhang
1105a1a465
Convert more pages to use ActionButtonPreference
...
- text to speech page
- blue tooth detail page
- installed app page
Change-Id: Ib743a144cc6025055cd496ec077f13fce4db0c69
Bug: 63991885
Test: robotests
2017-08-01 14:27:42 -07:00
Meng Wang
1343c78445
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev am: 1ae2573bb5
...
am: 7a801228f6
2017-08-01 21:20:52 +00:00
Bill Yi
97011ed5a8
Import translations. DO NOT MERGE am: b9fa3d1115 -s ours am: 6444b2ac85 -s ours
...
am: 090a10ab35
2017-08-01 21:20:26 +00:00
Bill Yi
4640be3275
Import translations. DO NOT MERGE am: b9fa3d1115 -s ours am: 1b16f952e7 -s ours
...
am: bfeafd271c
2017-08-01 21:20:04 +00:00
Bill Yi
7f5b5f391d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 4f368a3acc
2017-08-01 21:19:19 +00:00
TreeHugger Robot
4f368a3acc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-01 21:00:25 +00:00
Andrew Sapperstein
9c9549bd29
Refactoring DoubleTwistPreferenceController.
...
Made the availability and setting logic static so that
it can be invoked without creating a controller.
Bug: 62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
2017-08-01 13:56:51 -07:00
Meng Wang
7a801228f6
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
...
am: 1ae2573bb5
2017-08-01 20:55:13 +00:00
Bill Yi
090a10ab35
Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
...
am: 6444b2ac85
2017-08-01 20:54:24 +00:00
Bill Yi
bfeafd271c
Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
...
am: 1b16f952e7
2017-08-01 20:39:43 +00:00
Meng Wang
1ae2573bb5
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
2017-08-01 20:37:37 +00:00
Bill Yi
1b16f952e7
Import translations. DO NOT MERGE
...
am: b9fa3d1115
2017-08-01 20:35:43 +00:00
Bill Yi
6444b2ac85
Import translations. DO NOT MERGE
...
am: b9fa3d1115
2017-08-01 20:35:41 +00:00
Salvador Martinez
fec50f4248
Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91
...
am: 6db99201aa
2017-08-01 20:15:41 +00:00
Salvador Martinez
6db99201aa
Merge "Shorten main settings battery string" into oc-mr1-dev
...
am: 4e963f8f91
2017-08-01 20:01:13 +00:00
Fan Zhang
16e0ef2b7d
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da
...
am: bbd92b5748
2017-08-01 19:46:36 +00:00
TreeHugger Robot
4e963f8f91
Merge "Shorten main settings battery string" into oc-mr1-dev
2017-08-01 19:45:59 +00:00
Fan Zhang
bbd92b5748
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
...
am: 7fbfda67da
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
2017-08-01 19:09:31 +00:00
Bill Yi
0c15c622ad
Import translations. DO NOT MERGE
...
Change-Id: Ie52cecfa47dc7d0a982d8f36a12b1b024bfbfd0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:32:34 -07:00
Bill Yi
0607783046
Import translations. DO NOT MERGE
...
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:31:16 -07:00
Bill Yi
4421852e12
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
...
am: 8c3d164113
2017-08-01 18:29:01 +00:00
Bill Yi
f0f41105ed
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: 23e79be08d -s ours
...
am: 8c0d932862
2017-08-01 18:28:35 +00:00
Android Build Merger (Role)
8c3d164113
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 18:18:27 +00:00
Bill Yi
6f76c3b39f
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: f8c9a63ca6
2017-08-01 18:18:06 +00:00
Bill Yi
8c0d932862
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: 23e79be08d
2017-08-01 18:18:03 +00:00
Bill Yi
b9fa3d1115
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
2017-08-01 11:15:13 -07:00
Bill Yi
f8c9a63ca6
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:02 +00:00
Bill Yi
23e79be08d
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:01 +00:00
Bill Yi
2f525fbdc5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64073208
Change-Id: I9ff6c2aa7d4a499617610046f74bb60b9f58a399
2017-08-01 11:03:31 -07:00
Salvador Martinez
dcb96058ef
Shorten main settings battery string
...
This string will be too long in other languages so we're shortening
it for the main settings screen.
Test: robotests updated
Bug: 64124535
Change-Id: I5ccad99b1023f84ee72a144e07b1ea60f3fc01d5
2017-08-01 10:29:44 -07:00
Meng Wang
36b430e1fa
Rephrase emergency_address_summary to remove '911'
...
Because it's not easy to translate 911 per country.
Fixes: 64226955
Test: manual
Change-Id: Ibe052090f8d33a1f3f49150fb9c0c1cc2ffb947f
2017-08-01 09:36:34 -07:00
Tony Mantler
c5dc1dc250
Merge changes from topics 'SystemPropPoker', 'DevSettingsPrefsFile'
...
* changes:
Refactor SystemPropPoker
Remove development settings prefs file
2017-08-01 16:12:14 +00:00
Geoffrey Pitsch
e80ffadd75
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313 am: cf83f9dd12
...
am: 18a5474740
2017-08-01 14:31:37 +00:00
Geoffrey Pitsch
2db7b43623
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313 am: 07052239fd
...
am: 5e6449b4f8
2017-08-01 14:26:16 +00:00
Geoffrey Pitsch
18a5474740
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: cf83f9dd12
2017-08-01 14:23:20 +00:00
Geoffrey Pitsch
5e6449b4f8
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: 07052239fd
2017-08-01 14:16:59 +00:00
Geoffrey Pitsch
cf83f9dd12
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
07052239fd
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:07:37 +00:00
Geoffrey Pitsch
6d62355313
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
2017-08-01 14:00:18 +00:00
jackqdyulei
94a559eb6b
Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf am: 26e7518f76 -s ours" into oc-mr1-dev-plus-aosp
...
am: c96e9fc57d
2017-08-01 03:09:07 +00:00
jackqdyulei
c4600e3dc9
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf -s ours am: 72054d6db3 -s ours
...
am: bc1d04ae80
2017-08-01 03:08:28 +00:00
Jeff Davidson
0454421c31
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7 am: 470c87cfea
...
am: 1034816211
2017-08-01 03:08:05 +00:00
