Commit Graph

41712 Commits

Author SHA1 Message Date
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.

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

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
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

Change-Id: I8fe1a2170c1e93e898959cbd932596b90ba10bb5
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

Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d
2017-10-20 19:52:40 +00:00
Jack Yu
d4ef8eca27 Merge "Refactored area update info support" am: 60d6ffbc6c
am: 3966912efa

Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d
2017-10-20 19:41:05 +00:00
Jack Yu
3966912efa Merge "Refactored area update info support"
am: 60d6ffbc6c

Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
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  -s ours

Change-Id: Iaacf56caee3d21c12d4278b08e543e3a6fb03ead
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  -s ours

Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef
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  -s ours

Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665
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

Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872
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

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
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

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
2017-10-20 15:15:14 +00:00
Ben Schwartz
ed97eaeb4a Merge "Add a developer option for controlling DNS over TLS"
am: c8207de343

Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
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
jeffreyhuang
f6d360ebb5 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
2017-10-19 16:50:45 -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

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