Ningyuan Wang
0117b995f4
Enforce null check for mAccessPoint
...
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
2017-11-03 17:31:03 -07:00
Bill Yi
63e09f1f8e
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3 am: 2ef76cb0d2
...
am: 17a1b4e1fc
2017-10-24 20:51:44 +00:00
Fan Zhang
9184c48c3e
Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29 am: e373209b97
...
am: 614f7aafdc
2017-10-24 20:50:40 +00:00
Bill Yi
17a1b4e1fc
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3
...
am: 2ef76cb0d2
2017-10-24 20:42:12 +00:00
Fan Zhang
614f7aafdc
Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
...
am: e373209b97
2017-10-24 20:41:16 +00:00
Bill Yi
2ef76cb0d2
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: aa8a972ea3
2017-10-24 20:33:44 +00:00
Fan Zhang
e373209b97
Merge "Fix wrong position of cursor in OwnerInfoSettings"
...
am: 2bcbc35b29
2017-10-24 20:33:03 +00:00
Bill Yi
41c4483909
Import translations. DO NOT MERGE am: 66ecad49ba -s ours
...
am: 18fea4f0c3
2017-10-24 20:05:39 +00:00
Bill Yi
18fea4f0c3
Import translations. DO NOT MERGE
...
am: 66ecad49ba
2017-10-24 20:03:09 +00:00
TreeHugger Robot
01ff9a80d0
Merge "Deprecate resId field in SearchIndexableResources"
2017-10-24 18:42:03 +00:00
Bill Yi
aa8a972ea3
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
2017-10-24 11:32:26 -07:00
Fan Zhang
2bcbc35b29
Merge "Fix wrong position of cursor in OwnerInfoSettings"
2017-10-24 18:13:25 +00:00
Bill Yi
66ecad49ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-24 10:24:03 -07:00
Fan Zhang
89b8e5c103
Deprecate resId field in SearchIndexableResources
...
Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests
2017-10-24 09:59:16 -07:00
Jeffrey Huang
f253f0e10d
Merge "Reduce padding so that view is no longer hidden"
2017-10-24 16:52:12 +00:00
tiansiming
7206a2998d
Fix wrong position of cursor in OwnerInfoSettings
...
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-24 17:19:27 +08:00
Rajeev Kumar
331a4459f0
resolve merge conflicts of ac0fd76521 to master
...
Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.
2017-10-23 22:36:09 -07:00
Rajeev Kumar
ac0fd76521
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
...
am: dd8e66fa20
2017-10-24 05:01:49 +00:00
Rajeev Kumar
dd8e66fa20
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
...
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug: 68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
2017-10-23 21:51:02 -07:00
Fan Zhang
43ff3b4202
Add strings to support multi-state vivid color management am: e1543a3895
...
am: bb6efe3743
2017-10-24 00:29:14 +00:00
TreeHugger Robot
3ec4dcb5f6
Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"
2017-10-24 00:27:55 +00:00
Fan Zhang
bb6efe3743
Add strings to support multi-state vivid color management
...
am: e1543a3895
2017-10-24 00:27:02 +00:00
Fan Zhang
e1543a3895
Add strings to support multi-state vivid color management
...
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
2017-10-23 23:45:47 +00:00
TreeHugger Robot
74ab2fff66
Merge "Deprecate Icons from SearchIndexableResources"
2017-10-23 23:15:02 +00:00
Daniel Finchelstein
5d0fc58af0
Merge "Revert "Revert "Settings: Enable HAL HDR+ by default"""
2017-10-23 22:54:06 +00:00
Tony Mantler
d9af0b839d
Move SimStatus and ImeiInfo Pref Controllers to SettingsLib
...
Bug: 67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e
2017-10-23 15:42:43 -07:00
Fan Zhang
f183b6870c
Deprecate Icons from SearchIndexableResources
...
Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes: 38027997
Test: robotests
2017-10-23 14:31:34 -07:00
Doris Ling
2e950fca63
Set uninstall button to gray color.
...
For user installed app, set the uninstall button as negative button so
that it will have the correct color.
Change-Id: Ic631386affddf82ae0ebbf29fb572de1f067fc90
Fixes: 68154647
Test: make RunSettingsRoboTests
2017-10-23 14:05:45 -07:00
Chien-Yu Chen
e96571d106
Revert "Revert "Settings: Enable HAL HDR+ by default""
...
This reverts commit 781e762c2c
2017-10-23 13:30:57 -07:00
TreeHugger Robot
9d85cfe762
Merge "Set activity title from preference screen title."
2017-10-21 00:07:39 +00:00
TreeHugger Robot
4776e0e1cd
Merge "Adding new methods to FakeUid."
2017-10-20 23:22:40 +00:00
TreeHugger Robot
988c82ea3b
Merge "Fix crash from Settings Search"
2017-10-20 23:00:42 +00:00
Doris Ling
1a6887bbd3
Set activity title from preference screen title.
...
- When we initialize the preference screen, if the screen title is
available, use that to set the activity title, so that it will be up to
date with dynamic language changes.
- for preference fragment that don't have preference screen xml, added a
getTitle() method for the fragment to provide the title explicitly.
- use feature flag to switch between the old and new mechanism for
handling activity title.
Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: I96318a5aa81e7b8ca94118adac3245ed27a03d93
2017-10-20 22:46:12 +00:00
TreeHugger Robot
1e87036496
Merge "Add FingerprintEnroll API"
2017-10-20 21:40:47 +00:00
Jack Yu
d85c7488d8
Merge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa am: d4ef8eca27
...
am: 71beadce17
2017-10-20 20:06:05 +00:00
jeffreyhuang
774b6b7573
Reduce padding so that view is no longer hidden
...
Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878
Fixes: 63583041
Test: Manual using settings app
2017-10-20 13:00:36 -07:00
Jack Yu
71beadce17
Merge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa
...
am: d4ef8eca27
2017-10-20 19:52:40 +00:00
Jack Yu
d4ef8eca27
Merge "Refactored area update info support" am: 60d6ffbc6c
...
am: 3966912efa
2017-10-20 19:41:05 +00:00
Jack Yu
3966912efa
Merge "Refactored area update info support"
...
am: 60d6ffbc6c
2017-10-20 19:30:29 +00:00
Treehugger Robot
60d6ffbc6c
Merge "Refactored area update info support"
2017-10-20 19:19:09 +00:00
TreeHugger Robot
04d9769c0e
Merge "Switch the buttons in bt detail page"
2017-10-20 17:55:37 +00:00
Bill Yi
822e666f24
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f -s ours am: 8313368b32 -s ours
...
am: 7a20f4a206
2017-10-20 17:45:29 +00:00
Bill Yi
7a20f4a206
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f -s ours
...
am: 8313368b32
2017-10-20 17:15:14 +00:00
TreeHugger Robot
012fe11939
Merge "Catch exception when checking WifiDisplay availability"
2017-10-20 16:55:37 +00:00
Bill Yi
8313368b32
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: a5d652c89f
2017-10-20 16:47:03 +00:00
Jeffrey Huang
78c09dfb20
Merge changes Icddb9d35,I36f76f93,Ie7b6afa5
...
* changes:
Add existing controllers in about phone to v2 fork
Create XML layout for about phone v2
Fork a new about phone layout
2017-10-20 16:45:51 +00:00
Ben Schwartz
1887caef9d
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a am: 1fd46833ef
...
am: 2372074d57
2017-10-20 15:46:01 +00:00
Ben Schwartz
2372074d57
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
...
am: 1fd46833ef
2017-10-20 15:33:50 +00:00
TreeHugger Robot
a5d652c89f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:28:33 +00:00
Ben Schwartz
1fd46833ef
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
...
am: ed97eaeb4a
2017-10-20 15:15:14 +00:00
