Robin Lee
d5afb5a60c
resolve merge conflicts of 6446d2f to master
...
Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e
2016-12-23 12:16:19 +00:00
Robin Lee
6446d2f0d8
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868 am: 4395176792
...
am: 7779d9ee91
2016-12-23 10:45:23 +00:00
Robin Lee
7779d9ee91
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868
...
am: 4395176792
2016-12-23 10:39:24 +00:00
Robin Lee
4395176792
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
...
am: 601d339868
2016-12-23 10:33:22 +00:00
Robin Lee
601d339868
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
2016-12-23 10:29:03 +00:00
Tadashi G. Takaoka
8a005f90ce
Merge "Refactor DynamicIndexableContentMonitor"
2016-12-23 06:05:04 +00:00
Nathan Harold
6a7d1ed6ac
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev am: 94dee56f8d
...
am: 4bf8e85005
2016-12-23 01:26:43 +00:00
Nathan Harold
0ad40bee4f
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List am: d18b9fcde0
...
am: edb79b6222
2016-12-23 01:26:25 +00:00
Nathan Harold
4bf8e85005
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
...
am: 94dee56f8d
2016-12-23 01:19:55 +00:00
Nathan Harold
edb79b6222
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
...
am: d18b9fcde0
2016-12-23 01:19:54 +00:00
Nathan Harold
94dee56f8d
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
2016-12-23 01:11:39 +00:00
Pankaj Kanwar
61893815a4
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: 642e48e527
...
am: fbb870c94e
2016-12-22 21:11:22 +00:00
pkanwar
d7cb15e33f
DO NOT MERGE: Add UI toggle to control connections to carrier networks. am: 675122ad51 -s ours
...
am: 7c4809a9c3
2016-12-22 21:06:34 +00:00
Pankaj Kanwar
fbb870c94e
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
...
am: 642e48e527
2016-12-22 20:57:57 +00:00
pkanwar
7c4809a9c3
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
am: 675122ad51
2016-12-22 20:54:05 +00:00
Pankaj Kanwar
642e48e527
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
2016-12-22 20:41:55 +00:00
TreeHugger Robot
5bc617bd67
Merge "Update typo in string"
2016-12-22 18:36:48 +00:00
Maurice Lam
60f271f6e1
Merge "Depend on gingerbread variant of SuwLib"
2016-12-22 18:15:54 +00:00
pkanwar
675122ad51
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
Bug: 31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
2016-12-22 09:39:12 -08:00
Fan Zhang
cd23122aab
Update typo in string
...
Change-Id: If3be29b785a05198984b0f990629499befcaed88
Fixes: 33738394
Test: compiles
2016-12-22 09:14:04 -08:00
Tadashi G. Takaoka
a034fa5407
Refactor DynamicIndexableContentMonitor
...
Refactor content monitoring code into a few singletons to keep alive
while Settings app is running.
Bug: 32995210
Test: Manually installing/uninstalling AOSP LatinIME.apk while
Settings app is/isn't running, then search AOSP.
Test: Connecting/Disconnecting Anker bluetooth keyboard while Settings
app is/isn't running, then search Anker.
Test: Added Robolectric test for DynamicIndexableContentMonitor.
Change-Id: I588e33be169fc9677d41c3daa59ab400f04f6419
2016-12-22 17:53:07 +09:00
Bill Yi
68220c6d74
Import translations. DO NOT MERGE am: 54e5382136 -s ours
...
am: e41df7b27c
2016-12-22 08:33:22 +00:00
Bill Yi
e41df7b27c
Import translations. DO NOT MERGE
...
am: 54e5382136
2016-12-22 07:57:23 +00:00
TreeHugger Robot
1df45999a3
Merge "Import translations. DO NOT MERGE"
2016-12-22 07:54:20 +00:00
insight.lee
7c4d52c570
Update VPN preference state after disallow configuring VPN policy has changed.
...
1. When Settings > More and change disallow configuring VPN policy
and resume Settings, update VPN preference state.
2. When Settings > More > VPN and change disallow configuring VPN policy
and resume VPN Settings, update its state.
Test: manual
Signed-off-by : Sungmin Lee <insight.lee@lge.com >
Change-Id: I4f3c85733ca6ba05cba46e2f4854f54a42b10c21
2016-12-22 16:14:48 +09:00
Bill Yi
54e5382136
Import translations. DO NOT MERGE
...
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
2016-12-21 21:59:21 -08:00
Bill Yi
4df844564a
Import translations. DO NOT MERGE
...
Change-Id: Ia651171b7f07833e707c6c81dc6045d9650ea7a2
Auto-generated-cl: translation import
2016-12-21 21:54:11 -08:00
TreeHugger Robot
3a1fae3ba9
Merge "Change Network & Internet to Network & internet."
2016-12-22 01:01:42 +00:00
TreeHugger Robot
2f97111d8a
Merge "Align more prefs for icon space."
2016-12-22 00:29:06 +00:00
TreeHugger Robot
627c811c11
Merge "Expose signals being sent to support in a fragment to the user"
2016-12-22 00:28:22 +00:00
Jaewoong Jung
bdd0f0f66c
Merge "Implements additional battery info menu behavior."
2016-12-21 22:57:32 +00:00
TreeHugger Robot
41fa24b9df
Merge "Changed string to notify user of effects"
2016-12-21 22:42:02 +00:00
TreeHugger Robot
e59100ab9e
Merge "Removed fake data"
2016-12-21 22:19:18 +00:00
nharold
2fdcea0fa3
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d am: f44fd8d98d
...
am: 5e322a0e4c
2016-12-21 22:16:28 +00:00
TreeHugger Robot
9ccd30f167
Merge "Add first inline switch result."
2016-12-21 22:11:59 +00:00
TreeHugger Robot
92f5a4844d
Merge "Use MetricsEvent to log page views for new IA pages."
2016-12-21 22:05:35 +00:00
nharold
5e322a0e4c
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d
...
am: f44fd8d98d
2016-12-21 21:59:18 +00:00
nharold
f44fd8d98d
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26
...
am: 9b0c6a525d
2016-12-21 21:53:18 +00:00
nharold
9b0c6a525d
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
...
am: c98ca3da26
2016-12-21 21:49:04 +00:00
Doris Ling
e71fa39118
Change Network & Internet to Network & internet.
...
Make "Internet" lowercase to be consistent with other settings title and
match the UI spec.
Bug: 33677629
Test: make SettingsFunctionalTests
Change-Id: I76d20c15e65db3c43e208ab8a48b7626c2103961
2016-12-21 13:44:46 -08:00
nharold
c98ca3da26
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
2016-12-21 21:40:21 +00:00
Julia Reynolds
b42ac40b5f
Merge "Support showing notifications as badges."
2016-12-21 21:15:47 +00:00
Fan Zhang
8f057ca3d4
Use MetricsEvent to log page views for new IA pages.
...
Bug: 33812754
Test: RunSettingsRoboTests
Change-Id: Ib49daa1078df44f50ecfa351c061d36849708fd7
2016-12-21 12:12:32 -08:00
Sean Stout
999a5bed11
Merge "Renamed "Demo mode" to "System UI demo mode""
2016-12-21 19:36:53 +00:00
Fan Zhang
ac81f26e30
Align more prefs for icon space.
...
Bug: 33775510
Fixes: 33798492
Test: Visual
Test: RunSettingsRoboTests
Change-Id: I9b296e4148be8c1ae537b6418b4f384bbc63a8db
2016-12-21 11:20:24 -08:00
Matthew Fritze
65fb01b520
Add first inline switch result.
...
Adds gestures as Inline switch results to Settings Search.
Change-Id: Ie9b69ac2a54756d5b756401e348cae0a02c907c9
Fixes: 33669037
Test: make RunSettingsRoboTests
2016-12-21 10:52:59 -08:00
Fan Zhang
d65ab0e63f
Merge "Revert "Align more prefs for icon space.""
2016-12-21 17:04:04 +00:00
Fan Zhang
8af4c10476
Revert "Align more prefs for icon space."
...
Bug: 33798492
This reverts commit ded9fc9b07
2016-12-21 17:03:00 +00:00
Jaewoong Jung
6a43a06cac
Implements additional battery info menu behavior.
...
Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
2016-12-20 19:17:16 -08:00
Youhan Wang
75be542b50
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu. am: d9b3709fc1
...
am: 70b47859fa
2016-12-21 00:42:10 +00:00
