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
Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b
2017-10-19 19:29:11 +00:00
tiansiming
cca755cfac
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
am: 92e77cbd43
...
am: ecf2bdb46f
Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
2017-10-19 19:24:53 +00:00
tiansiming
ecf2bdb46f
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
...
am: 92e77cbd43
Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43
Merge "Fix wrong position of cursor in IccLockSettings"
...
am: 3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
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
Kevin Chyn
42ae10e6ba
Add FingerprintEnroll API
...
Fixes: 65459785
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
Flow is correct with and without PIN/Pattern/Pass set up
Test: make -j56 SettingsUnitTests
adb install -r out/target/product/walleye/data/app/SettingsUnitTests/SettingsUnitTests.apk
adb shell am instrument -w -e class com.android.settings.fingerprint.FingerprintEnrollIntroductionTest 'com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner'
Change-Id: If987257943190eb91d5822e683657aea621d2206
2017-10-19 11:54:25 -07:00
Matthew Fritze
9c3c7d8ccd
Fix crash from Settings Search
...
Security Settings was returning a search indexable
resource without an xml resource (in this case id = 0).
Settings search did not handle this exception and crashed.
This patch catches the exception, and adds a TODO to fix
the indexing in security settings.
Change-Id: Ic7f05c98d99cc45fbebbdc672c7e346c27daa0f0
Fixes: 67967367
Test: robotests
2017-10-19 10:58:05 -07: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
Maurice Lam
ac8024ef44
Update confirm button label
...
Test: Existing tests pass
Bug: 65123475
Change-Id: Ib730507db54fe2bab881fa040ead737c6736ee1a
2017-10-18 16:16:35 -07:00
TreeHugger Robot
5604f9bb4f
Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"
2017-10-18 23:10:12 +00:00
Malcolm Chen
d089db8d6e
Revert "Delete unused classes"
...
This reverts commit 2fa45c92e6
.
It bring back SlidingTabLayout.java which will be used for
multi-SIM configurations.
Bug: 65648147
Test: unittest
Change-Id: I84c75a2e1d33fc89f58165c662d82a8ad3d6ef20
2017-10-18 16:08:41 -07: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
-s ours
Change-Id: I8c23627db5650e7547b79a38d91754aa7cd67418
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
-s ours
Change-Id: I96930790d6006cb843667edb70fd1fe051f05649
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
-s ours
Change-Id: Ia5e090ac74029698f5d8c48712cbed64605ae977
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
-s ours
Change-Id: Icbc6d2a281b151fdcc60772cb3978c8592a685d7
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
Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9
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
Change-Id: Id4d0641a44fb537a5606e8c118ffdbc93aaf0ae2
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
Change-Id: I18058b80f7f7439f875213d5f6e59b2680cc3dc5
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
Change-Id: Ib7da524b1e6c64ded9706fedfe487aa99d43e22a
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
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
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
Change-Id: I83e412e91bdc14523b26ac11fc0918a21b74a26f
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
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
2017-10-18 21:51:30 +00:00
Jeff Sharkey
1e23fc8814
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
Change-Id: Id3c4eafd2628d04b94e33e057b228ed77c9c32c8
2017-10-18 21:50:29 +00:00
Jeff Sharkey
16776b64c8
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
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
2017-10-18 21:32:46 +00:00
Jeff Sharkey
3de9e565c8
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
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
2017-10-18 21:31:42 +00:00
Jeff Sharkey
a00521b3a0
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
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
2017-10-18 21:01:38 +00:00
Jeff Sharkey
a829548c12
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
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
2017-10-18 21:00:49 +00:00
Kweku Adams
19f896e073
Adding new methods to FakeUid.
...
Test: built and flashed to device
Bug: 65750808
Change-Id: Iddc198ce5b971105a44d15b8490138c18fc0f065
2017-10-18 13:56:04 -07:00
Jeff Sharkey
a637e31547
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
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
2017-10-18 20:40:16 +00:00
Jeff Sharkey
2a2d92eee8
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
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
2017-10-18 20:39:11 +00:00
TreeHugger Robot
25deda5129
Merge "Fix a monkey crash: guard against position -1."
2017-10-18 20:27:45 +00:00
Jeff Sharkey
397a3555b5
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
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
2017-10-18 20:26:31 +00:00
Jeff Sharkey
8f2a69fad3
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
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
2017-10-18 20:25:25 +00:00
Jeff Sharkey
629553fb49
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
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
2017-10-18 20:06:55 +00:00
Jeff Sharkey
85cb0b43da
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
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
2017-10-18 20:06:00 +00:00
Jeff Sharkey
d88820f3f6
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
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
2017-10-18 19:40:12 +00:00
Jeff Sharkey
e341fe95bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours
...
am: 416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
2017-10-18 19:39:10 +00:00
Jeff Sharkey
07c4c8efed
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
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
2017-10-18 19:27:49 +00:00