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
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
Ben Schwartz
ed97eaeb4a
Merge "Add a developer option for controlling DNS over TLS"
...
am: c8207de343
2017-10-20 15:06:10 +00:00
Treehugger Robot
c8207de343
Merge "Add a developer option for controlling DNS over TLS"
2017-10-20 14:58:39 +00:00
Bill Yi
074e2ee9ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -07:00
Jack Yu
2f010230df
Refactored area update info support
...
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8
2017-10-19 17:36:33 -07:00
Fan Zhang
1389a0c9c9
Catch exception when checking WifiDisplay availability
...
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes: 68013053
Test: robotests
2017-10-19 16:49:21 -07:00
jackqdyulei
d3ffdc564c
Switch the buttons in bt detail page
...
The forget button should be left and connect button be right.
Bug: 67915643
Test: RunSettingsRoboTests
Change-Id: I71bb99270c4a3d480346db1ded554ecc9b99e706
2017-10-19 16:48:28 -07:00
TreeHugger Robot
7544e115a7
Merge "Misc logging improvements"
2017-10-19 23:18:17 +00:00
jeffreyhuang
931681a633
Add existing controllers in about phone to v2 fork
...
- Added build number controller
- Added safety info controller
- Added regulatory info controller
Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icddb9d352b4f739ca1c7cf562dec09530cb41dac
2017-10-19 15:08:43 -07:00
jeffreyhuang
e5fc1fbd2c
Create XML layout for about phone v2
...
- Added all the necessary preferences in the xml layout
Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I36f76f9360b809eba077497db68d012098820868
2017-10-19 15:08:43 -07:00
TreeHugger Robot
a431360dfe
Merge "Fingerprint enrolling should update UI while in multi-window mode"
2017-10-19 21:47:21 +00:00
jeffreyhuang
d81622e790
Fork a new about phone layout
...
- Used a feature flag to hide the new about phone page
Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie7b6afa58b301128d1c60513ae4ee48d6ec6679b
2017-10-19 14:18:26 -07:00
tiansiming
6744588fd8
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43 am: ecf2bdb46f
...
am: cca755cfac
2017-10-19 19:29:11 +00:00
tiansiming
cca755cfac
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
...
am: ecf2bdb46f
2017-10-19 19:24:53 +00:00
tiansiming
ecf2bdb46f
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
...
am: 92e77cbd43
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43
Merge "Fix wrong position of cursor in IccLockSettings"
...
am: 3a3044eeef
2017-10-19 19:20:09 +00:00
Treehugger Robot
3a3044eeef
Merge "Fix wrong position of cursor in IccLockSettings"
2017-10-19 19:14:49 +00:00
tiansiming
64f48b5ce6
Fix wrong position of cursor in IccLockSettings
...
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-20 01:26:40 +08:00
Bill Yi
69d44faa12
Import translations. DO NOT MERGE
...
Change-Id: I077bf16890d37404acb52c6ee1fdf584a978e094
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-18 18:17:06 -07:00
TreeHugger Robot
ccee4218ea
Merge "Cleanup Controllers/Fragments"
2017-10-18 23:35:13 +00:00
TreeHugger Robot
2dda5a567d
Merge "Convert more loadIcon() to IconDrawableFactory"
2017-10-18 23:27:38 +00:00
TreeHugger Robot
5604f9bb4f
Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"
2017-10-18 23:10:12 +00:00
Jeff Sharkey
5bc864e7f7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0 am: 16776b64c8 am: 1dcb8522fa
...
am: 937ede14d8
2017-10-18 23:00:49 +00:00
Jeff Sharkey
889c78db4b
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12 am: 3de9e565c8 am: 1e23fc8814
...
am: 9220dda5b8
2017-10-18 23:00:17 +00:00
Jeff Sharkey
ad75711589
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0 am: 16776b64c8 am: 6b56423651
...
am: 0f1d957bb3
2017-10-18 22:59:45 +00:00
Jeff Sharkey
83664386b8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12 am: 3de9e565c8 am: e39f0c21f9
...
am: b5f7753e18
2017-10-18 22:58:42 +00:00
Jeff Sharkey
937ede14d8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0 am: 16776b64c8
...
am: 1dcb8522fa
2017-10-18 22:55:51 +00:00
Jeff Sharkey
9220dda5b8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12 am: 3de9e565c8
...
am: 1e23fc8814
2017-10-18 22:54:01 +00:00
Fan Zhang
5c4780f799
Misc logging improvements
...
- Log ACTION_SEARCH_RESULTS whenever a search query is performed.
eg, type "qu" will result 2 such logging events.
- Remove historam logging to search result click count (already logged
as ACTION_CLICK_SETTINGS_SEARCH_RESULT)
Change-Id: Ia207b34702e0f24a7885e47d093f6cce1314ebc4
Fixes: 67743512
Fixes: 64939544
Test: robotests
2017-10-18 15:44:38 -07:00
Jeff Sharkey
0f1d957bb3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0 am: 16776b64c8
...
am: 6b56423651
2017-10-18 22:27:47 +00:00
Jeff Sharkey
b5f7753e18
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12 am: 3de9e565c8
...
am: e39f0c21f9
2017-10-18 22:26:30 +00:00
jeffreyhuang
bb451a38e4
Cleanup Controllers/Fragments
...
- Removed extra comments in DevelopmentSettingsDashboardFragment
- Removed unused methods from controllers
- Clean up method names
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibe7a0921926d4529f62a212b55c8fa2f14ecb18b
2017-10-18 15:03:41 -07:00
Fan Zhang
abdeead114
Convert more loadIcon() to IconDrawableFactory
...
- AppGridView: used by preview chart in display size setting.
- DefaultBrowserPreferenceController: default browser icon in default
apps settings
- Enterprise application list
- Accessibility search result loader
Change-Id: Ibd12cd8854c68760ea3428fffa735bcbba48a277
Fixes: 64336923
Test: robotests
2017-10-18 15:03:19 -07:00
Jeff Sharkey
6b56423651
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0
...
am: 16776b64c8
2017-10-18 21:52:46 +00:00
Jeff Sharkey
1dcb8522fa
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0
...
am: 16776b64c8
2017-10-18 21:52:01 +00:00
Jeff Sharkey
e39f0c21f9
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12
...
am: 3de9e565c8
2017-10-18 21:51:30 +00:00
