OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMove the bluetooth icon logic to settingslib
jackqdyulei [Mon, 18 Sep 2017 20:43:43 +0000 (13:43 -0700)]
Move the bluetooth icon logic to settingslib

This cl contains the moving about:
1. Several methods in Bluetooth/Utils.java
2. Bluetooth icon drawables
3. Bluetooth strings
4. Tests

Bug: 65488978
Test: RunSettingslibRoboTests

Change-Id: I682daa3eeb5022beb90a95763c70d19d32d54915

7 years agoMerge "Update DeviceModelPreferenceController"
Jeffrey Huang [Wed, 25 Oct 2017 17:17:08 +0000 (17:17 +0000)]
Merge "Update DeviceModelPreferenceController"

7 years agoMerge "Only allow Settings app launch search result page"
Fan Zhang [Wed, 25 Oct 2017 16:47:44 +0000 (16:47 +0000)]
Merge "Only allow Settings app launch search result page"

7 years agoMerge "Add new color mode setting" into oc-mr1-dev am: 94aa05059d
Chia-I Wu [Wed, 25 Oct 2017 04:55:14 +0000 (04:55 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev am: 94aa05059d
am: c892a3cfc9

Change-Id: I971cf848dd70597c97270a008912c099c6bd24db

7 years agoMerge "Add new color mode setting" into oc-mr1-dev
Chia-I Wu [Wed, 25 Oct 2017 04:38:57 +0000 (04:38 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
am: 94aa05059d

Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974

7 years agoMerge "Add new color mode setting" into oc-mr1-dev
Chia-I Wu [Wed, 25 Oct 2017 04:28:59 +0000 (04:28 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev

7 years agoMerge "Rename files for consistency."
TreeHugger Robot [Wed, 25 Oct 2017 02:36:36 +0000 (02:36 +0000)]
Merge "Rename files for consistency."

7 years agoRename files for consistency.
Daniel Finchelstein [Tue, 24 Oct 2017 17:30:35 +0000 (10:30 -0700)]
Rename files for consistency.

Test: CTS (API2 tests)

Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b

7 years agoOnly allow Settings app launch search result page
Fan Zhang [Tue, 24 Oct 2017 16:27:02 +0000 (09:27 -0700)]
Only allow Settings app launch search result page

Bug: 68199963
Test: robotest
Change-Id: I0018e9c60b0dd46fc2420a563a93b706bf252dc4

7 years agoAdd new color mode setting
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting

Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)

The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).

Bug: 68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3 am...
Bill Yi [Tue, 24 Oct 2017 20:51:44 +0000 (20:51 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3 am: 2ef76cb0d2
am: 17a1b4e1fc

Change-Id: Ia8ad6a2475329fca2431ef99a9b890c8ec5502e5

7 years agoMerge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29 am: e373209b97
Fan Zhang [Tue, 24 Oct 2017 20:50:40 +0000 (20:50 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29 am: e373209b97
am: 614f7aafdc

Change-Id: Iafee32f071387ac36faa42cc9e3812109f769a8b

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3
Bill Yi [Tue, 24 Oct 2017 20:42:12 +0000 (20:42 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3
am: 2ef76cb0d2

Change-Id: I906612380c00db46a4d71e8aeceb822af857f744

7 years agoMerge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
Fan Zhang [Tue, 24 Oct 2017 20:41:16 +0000 (20:41 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
am: e373209b97

Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: aa8a972ea3

Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93

7 years agoMerge "Fix wrong position of cursor in OwnerInfoSettings"
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am: 2bcbc35b29

Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6

7 years agoImport translations. DO NOT MERGE am: 66ecad49ba -s ours
Bill Yi [Tue, 24 Oct 2017 20:05:39 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am: 66ecad49ba  -s ours
am: 18fea4f0c3  -s ours

Change-Id: I186526954502d5b71e4d847e3d6614486bdd8da0

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 24 Oct 2017 20:03:09 +0000 (20:03 +0000)]
Import translations. DO NOT MERGE
am: 66ecad49ba  -s ours

Change-Id: I46bc589e7ad984e910b5ebfc118614d0d1b0bee0

7 years agoMerge "Deprecate resId field in SearchIndexableResources"
TreeHugger Robot [Tue, 24 Oct 2017 18:42:03 +0000 (18:42 +0000)]
Merge "Deprecate resId field in SearchIndexableResources"

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

7 years agoMerge "Fix wrong position of cursor in OwnerInfoSettings"
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170

7 years agoDeprecate resId field in SearchIndexableResources
Fan Zhang [Mon, 23 Oct 2017 22:21:09 +0000 (15:21 -0700)]
Deprecate resId field in SearchIndexableResources

Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests

7 years agoMerge "Reduce padding so that view is no longer hidden"
Jeffrey Huang [Tue, 24 Oct 2017 16:52:12 +0000 (16:52 +0000)]
Merge "Reduce padding so that view is no longer hidden"

7 years agoFix wrong position of cursor in OwnerInfoSettings
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
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>
7 years agoresolve merge conflicts of ac0fd76521 to master
Rajeev Kumar [Tue, 24 Oct 2017 05:35:35 +0000 (22:35 -0700)]
resolve merge conflicts of ac0fd76521 to master

Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.

7 years agoRemove SearchIndexProvider from DataPlanUsageSummary fragment.
Rajeev Kumar [Tue, 24 Oct 2017 05:01:49 +0000 (05:01 +0000)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am: dd8e66fa20

Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550

7 years agoRemove SearchIndexProvider from DataPlanUsageSummary fragment.
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
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

7 years agoAdd strings to support multi-state vivid color management am: e1543a3895
Fan Zhang [Tue, 24 Oct 2017 00:29:14 +0000 (00:29 +0000)]
Add strings to support multi-state vivid color management am: e1543a3895
am: bb6efe3743

Change-Id: Ie33e65251265406cfb80d4a46e0fff4c6915d161

7 years agoMerge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"
TreeHugger Robot [Tue, 24 Oct 2017 00:27:55 +0000 (00:27 +0000)]
Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"

7 years agoAdd strings to support multi-state vivid color management
Fan Zhang [Tue, 24 Oct 2017 00:27:02 +0000 (00:27 +0000)]
Add strings to support multi-state vivid color management
am: e1543a3895

Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f

7 years agoAdd strings to support multi-state vivid color management
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management

Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f

7 years agoMerge "Deprecate Icons from SearchIndexableResources"
TreeHugger Robot [Mon, 23 Oct 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Deprecate Icons from SearchIndexableResources"

7 years agoMerge "Revert "Revert "Settings: Enable HAL HDR+ by default"""
Daniel Finchelstein [Mon, 23 Oct 2017 22:54:06 +0000 (22:54 +0000)]
Merge "Revert "Revert "Settings: Enable HAL HDR+ by default"""

7 years agoMove SimStatus and ImeiInfo Pref Controllers to SettingsLib
Tony Mantler [Fri, 20 Oct 2017 22:03:28 +0000 (15:03 -0700)]
Move SimStatus and ImeiInfo Pref Controllers to SettingsLib

Bug: 67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e

7 years agoDeprecate Icons from SearchIndexableResources
Fan Zhang [Mon, 23 Oct 2017 21:11:34 +0000 (14:11 -0700)]
Deprecate Icons from SearchIndexableResources

Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes: 38027997
Test: robotests

7 years agoSet uninstall button to gray color.
Doris Ling [Mon, 23 Oct 2017 21:05:45 +0000 (14:05 -0700)]
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

7 years agoRevert "Revert "Settings: Enable HAL HDR+ by default""
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""

This reverts commit 781e762c2c68027c6b4bf8bcb71979c5e8c595c3.

Also updated the V2 version, which was not in the original revert CL.

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24

7 years agoMerge "Set activity title from preference screen title."
TreeHugger Robot [Sat, 21 Oct 2017 00:07:39 +0000 (00:07 +0000)]
Merge "Set activity title from preference screen title."

7 years agoMerge "Adding new methods to FakeUid."
TreeHugger Robot [Fri, 20 Oct 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Adding new methods to FakeUid."

7 years agoMerge "Fix crash from Settings Search"
TreeHugger Robot [Fri, 20 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Fix crash from Settings Search"

7 years agoSet activity title from preference screen title.
Doris Ling [Fri, 20 Oct 2017 22:29:56 +0000 (15:29 -0700)]
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

7 years agoMerge "Add FingerprintEnroll API"
TreeHugger Robot [Fri, 20 Oct 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Add FingerprintEnroll API"

7 years agoMerge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa am: d4ef8eca27
Jack Yu [Fri, 20 Oct 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa am: d4ef8eca27
am: 71beadce17

Change-Id: I8fe1a2170c1e93e898959cbd932596b90ba10bb5

7 years agoReduce padding so that view is no longer hidden
jeffreyhuang [Fri, 20 Oct 2017 20:00:36 +0000 (13:00 -0700)]
Reduce padding so that view is no longer hidden

Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878
Fixes: 63583041
Test: Manual using settings app

7 years agoMerge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa
Jack Yu [Fri, 20 Oct 2017 19:52:40 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa
am: d4ef8eca27

Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d

7 years agoMerge "Refactored area update info support" am: 60d6ffbc6c
Jack Yu [Fri, 20 Oct 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Refactored area update info support" am: 60d6ffbc6c
am: 3966912efa

Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d

7 years agoMerge "Refactored area update info support"
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am: 60d6ffbc6c

Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f

7 years agoMerge "Refactored area update info support"
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"

7 years agoMerge "Switch the buttons in bt detail page"
TreeHugger Robot [Fri, 20 Oct 2017 17:55:37 +0000 (17:55 +0000)]
Merge "Switch the buttons in bt detail page"

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f ...
Bill Yi [Fri, 20 Oct 2017 17:45:29 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f  -s ours am: 8313368b32  -s ours
am: 7a20f4a206  -s ours

Change-Id: Iaacf56caee3d21c12d4278b08e543e3a6fb03ead

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f ...
Bill Yi [Fri, 20 Oct 2017 17:15:14 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f  -s ours
am: 8313368b32  -s ours

Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef

7 years agoMerge "Catch exception when checking WifiDisplay availability"
TreeHugger Robot [Fri, 20 Oct 2017 16:55:37 +0000 (16:55 +0000)]
Merge "Catch exception when checking WifiDisplay availability"

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:47:03 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: a5d652c89f  -s ours

Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665

7 years agoMerge changes Icddb9d35,I36f76f93,Ie7b6afa5
Jeffrey Huang [Fri, 20 Oct 2017 16:45:51 +0000 (16:45 +0000)]
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

7 years agoMerge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97ea...
Ben Schwartz [Fri, 20 Oct 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a am: 1fd46833ef
am: 2372074d57

Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872

7 years agoMerge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
Ben Schwartz [Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
am: 1fd46833ef

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:28:33 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Add a developer option for controlling DNS over TLS" am: c8207de343
Ben Schwartz [Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
am: ed97eaeb4a

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240

7 years agoMerge "Add a developer option for controlling DNS over TLS"
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am: c8207de343

Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3

7 years agoMerge "Add a developer option for controlling DNS over TLS"
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 10:21:50 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623

7 years agoRefactored area update info support
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
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 c3cab8ecb84051abac144aaa0f94ee9276c89aab)

7 years agoUpdate DeviceModelPreferenceController
jeffreyhuang [Thu, 19 Oct 2017 23:44:59 +0000 (16:44 -0700)]
Update DeviceModelPreferenceController

 - Added serial number to the dialog for about phone v2
 - prefixed model to the preference summary for about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ic2950adcecf940ad8c9256688dc70b662ad5f0d6

7 years agoCatch exception when checking WifiDisplay availability
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability

Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes: 68013053
Test: robotests

7 years agoSwitch the buttons in bt detail page
jackqdyulei [Thu, 19 Oct 2017 23:34:33 +0000 (16:34 -0700)]
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

7 years agoMerge "Misc logging improvements"
TreeHugger Robot [Thu, 19 Oct 2017 23:18:17 +0000 (23:18 +0000)]
Merge "Misc logging improvements"

7 years agoAdd existing controllers in about phone to v2 fork
jeffreyhuang [Thu, 19 Oct 2017 21:46:32 +0000 (14:46 -0700)]
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

7 years agoCreate XML layout for about phone v2
jeffreyhuang [Thu, 19 Oct 2017 21:29:28 +0000 (14:29 -0700)]
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

7 years agoMerge "Fingerprint enrolling should update UI while in multi-window mode"
TreeHugger Robot [Thu, 19 Oct 2017 21:47:21 +0000 (21:47 +0000)]
Merge "Fingerprint enrolling should update UI while in multi-window mode"

7 years agoFork a new about phone layout
jeffreyhuang [Thu, 19 Oct 2017 20:36:40 +0000 (13:36 -0700)]
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

7 years agoMerge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43...
tiansiming [Thu, 19 Oct 2017 19:29:11 +0000 (19:29 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43 am: ecf2bdb46f
am: cca755cfac

Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b

7 years agoMerge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
tiansiming [Thu, 19 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
am: ecf2bdb46f

Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e

7 years agoMerge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
tiansiming [Thu, 19 Oct 2017 19:22:16 +0000 (19:22 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
am: 92e77cbd43

Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031

7 years agoMerge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am: 3a3044eeef

Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67

7 years agoMerge "Fix wrong position of cursor in IccLockSettings"
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"

7 years agoAdd FingerprintEnroll API
Kevin Chyn [Fri, 13 Oct 2017 23:34:05 +0000 (16:34 -0700)]
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

7 years agoFix crash from Settings Search
Matthew Fritze [Thu, 19 Oct 2017 17:38:08 +0000 (10:38 -0700)]
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

7 years agoFix wrong position of cursor in IccLockSettings
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
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>
7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 19 Oct 2017 01:17:06 +0000 (18:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I077bf16890d37404acb52c6ee1fdf584a978e094
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Cleanup Controllers/Fragments"
TreeHugger Robot [Wed, 18 Oct 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Cleanup Controllers/Fragments"

7 years agoMerge "Convert more loadIcon() to IconDrawableFactory"
TreeHugger Robot [Wed, 18 Oct 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Convert more loadIcon() to IconDrawableFactory"

7 years agoMerge "Use correct flags on ACTION_TIME_CHANGED broadcast"
TreeHugger Robot [Wed, 18 Oct 2017 23:10:12 +0000 (23:10 +0000)]
Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 23:00:49 +0000 (23:00 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 23:00:17 +0000 (23:00 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:59:45 +0000 (22:59 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:58:42 +0000 (22:58 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:55:51 +0000 (22:55 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:54:01 +0000 (22:54 +0000)]
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

7 years agoMisc logging improvements
Fan Zhang [Wed, 18 Oct 2017 22:27:13 +0000 (15:27 -0700)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:27:47 +0000 (22:27 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 22:26:30 +0000 (22:26 +0000)]
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

7 years agoCleanup Controllers/Fragments
jeffreyhuang [Wed, 18 Oct 2017 22:03:41 +0000 (15:03 -0700)]
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

7 years agoConvert more loadIcon() to IconDrawableFactory
Fan Zhang [Wed, 18 Oct 2017 00:04:04 +0000 (17:04 -0700)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:52:01 +0000 (21:52 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:50:29 +0000 (21:50 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
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

7 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
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