OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95...
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:53 +0000 (01:27 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a am: bb529c267d
am: 03cbc81f32

Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:38 +0000 (01:27 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b

Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df

7 years agoPrevent monkey tests from crashing with race conditions am: 7ac78f2daf am: 9264154bee
Matthew Fritze [Fri, 7 Oct 2016 01:27:24 +0000 (01:27 +0000)]
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf am: 9264154bee
am: 927007dd53

Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours...
Bill Yi [Fri, 7 Oct 2016 01:27:08 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours am: ffae7d82c3  -s ours
am: c8ef13d120  -s ours

Change-Id: Ic0c4a0ba5246c2cff4db7064d1ca4ff5f3bbf89e

7 years agoImport translations. DO NOT MERGE am: ae33f8e62c -s ours am: b1f3f659f1 -s ours
Bill Yi [Fri, 7 Oct 2016 01:26:52 +0000 (01:26 +0000)]
Import translations. DO NOT MERGE am: ae33f8e62c  -s ours am: b1f3f659f1  -s ours
am: 5fb2b6c1c5  -s ours

Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b3...
Philip P. Moltmann [Fri, 7 Oct 2016 01:26:36 +0000 (01:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367 am: ae23c07073
am: 96d81b1332

Change-Id: I9469b566e8682162271992f3175c5153c4668614

7 years agoUSB restriction is similar to media restriction am: 13ee50be48 am: a78fced068
Philip P. Moltmann [Fri, 7 Oct 2016 00:35:19 +0000 (00:35 +0000)]
USB restriction is similar to media restriction am: 13ee50be48 am: a78fced068
am: 58154e8c27

Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74

7 years agoMerge "Fix icon loading in EditUserInfo dialog on orientation change."
Stephen Chen [Thu, 6 Oct 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Fix icon loading in EditUserInfo dialog on orientation change."

7 years agoMerge "Use a Digit TtsSpan for pairing pins for talkback."
TreeHugger Robot [Thu, 6 Oct 2016 22:12:30 +0000 (22:12 +0000)]
Merge "Use a Digit TtsSpan for pairing pins for talkback."

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:17 +0000 (20:59 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
am: be3924c1b6

Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89

7 years agoPrevent monkey tests from crashing with race conditions am: 7ac78f2daf
Matthew Fritze [Thu, 6 Oct 2016 20:59:03 +0000 (20:59 +0000)]
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
am: 9264154bee

Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190

7 years agoImport translations. DO NOT MERGE am: ae33f8e62c -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:37 +0000 (20:58 +0000)]
Import translations. DO NOT MERGE am: ae33f8e62c  -s ours
am: b1f3f659f1  -s ours

Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
Philip P. Moltmann [Thu, 6 Oct 2016 20:58:22 +0000 (20:58 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073

Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:51 +0000 (20:27 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a

7 years agoPrevent monkey tests from crashing with race conditions
Matthew Fritze [Thu, 6 Oct 2016 20:27:36 +0000 (20:27 +0000)]
Prevent monkey tests from crashing with race conditions
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 6 Oct 2016 20:27:09 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 0d424ef9bd  -s ours

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 20:27:08 +0000 (20:27 +0000)]
Import translations. DO NOT MERGE
am: ae33f8e62c  -s ours

Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev
Philip P. Moltmann [Thu, 6 Oct 2016 20:26:50 +0000 (20:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9

7 years agoUse a Digit TtsSpan for pairing pins for talkback.
Fan Zhang [Thu, 6 Oct 2016 20:17:06 +0000 (13:17 -0700)]
Use a Digit TtsSpan for pairing pins for talkback.

Fixes: 31539689
Test: manually enabled talkback and focused on bt pairing pin. Verified
read-out is digits instead of a big number.

Change-Id: I71c53094762a71459e70485470684c515053b600

7 years agoUSB restriction is similar to media restriction am: 13ee50be48
Philip P. Moltmann [Thu, 6 Oct 2016 20:07:13 +0000 (20:07 +0000)]
USB restriction is similar to media restriction am: 13ee50be48
am: a78fced068

Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d

7 years agoUSB restriction is similar to media restriction
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:42 +0000 (19:55 +0000)]
USB restriction is similar to media restriction
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c

7 years agoMerge "Add test for new DashboardFragment and PreferenceController"
TreeHugger Robot [Thu, 6 Oct 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Add test for new DashboardFragment and PreferenceController"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 6 Oct 2016 18:02:33 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoAdd test for new DashboardFragment and PreferenceController
Fan Zhang [Wed, 5 Oct 2016 00:48:32 +0000 (17:48 -0700)]
Add test for new DashboardFragment and PreferenceController

Also added a FakeFeatureFactory to make it easier to mock different
FeatureProviders.

Bug: 31781480
Test: make RunSettingsRoboTests
Change-Id: Ie45db601e0bec951d7ef983ec2e3ca747ec1c3af

7 years agoFix icon loading in EditUserInfo dialog on orientation change.
Stephen Chen [Thu, 6 Oct 2016 01:06:03 +0000 (18:06 -0700)]
Fix icon loading in EditUserInfo dialog on orientation change.

UserSettings loads icons asynchronously, so an incorrect icon is loaded
on orientation change.

Bug: 30088727
Change-Id: I29b15ede4f7c3ca7e67b035a086271eccd075426
Fixes: 30088727
Test: Visual inspection

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Oct 2016 00:29:27 +0000 (17:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie36226fd9be0469ed8263fd156f9a7e28d4fe6cc
Auto-generated-cl: translation import

7 years agoMerge "Add search provider for storage dashboard."
TreeHugger Robot [Wed, 5 Oct 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add search provider for storage dashboard."

7 years agoMerge "Switch to static warning threshold when adopting."
TreeHugger Robot [Wed, 5 Oct 2016 19:24:33 +0000 (19:24 +0000)]
Merge "Switch to static warning threshold when adopting."

7 years agoSwitch to static warning threshold when adopting.
Jeff Sharkey [Wed, 5 Oct 2016 17:21:22 +0000 (11:21 -0600)]
Switch to static warning threshold when adopting.

See rationale and details in inline comment block.

Test: adopt slow and fast SD cards
Bug: 29990216
Change-Id: I927d683db5e43216ee0837290ee4ca23a55a5dbb

7 years agoAdd search provider for storage dashboard.
Fan Zhang [Wed, 5 Oct 2016 00:48:32 +0000 (17:48 -0700)]
Add search provider for storage dashboard.

Bug: 31800690
Test: manual
Change-Id: Icb906bf3b3698c1379e10cf6e346d489675ad940

7 years agoMerge "Update signature when calling CategoryManager.get."
Fan Zhang [Wed, 5 Oct 2016 00:14:50 +0000 (00:14 +0000)]
Merge "Update signature when calling CategoryManager.get."

7 years agoMerge "Add storage dashborad page."
Fan Zhang [Wed, 5 Oct 2016 00:10:27 +0000 (00:10 +0000)]
Merge "Add storage dashborad page."

7 years agoMerge "Give CTS the handle it expects to remove PIN."
Jeff Sharkey [Tue, 4 Oct 2016 22:19:35 +0000 (22:19 +0000)]
Merge "Give CTS the handle it expects to remove PIN."

7 years agoUpdate signature when calling CategoryManager.get.
Fan Zhang [Tue, 4 Oct 2016 22:18:02 +0000 (15:18 -0700)]
Update signature when calling CategoryManager.get.

Bug: 31781480
Test: compiles
Change-Id: Iee715aca3767a67728527ba9390787d3f8a7e5fe

7 years agoAdd storage dashborad page.
Fan Zhang [Tue, 4 Oct 2016 20:21:06 +0000 (13:21 -0700)]
Add storage dashborad page.

Refactor shared dashboard page display logic between storage and
system page.

Bug: 31800690
Test: RunSettingsRoboTests

Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193

7 years agoMerge "Add search provider for system dashboard fragment."
Fan Zhang [Tue, 4 Oct 2016 19:52:14 +0000 (19:52 +0000)]
Merge "Add search provider for system dashboard fragment."

7 years agoGive CTS the handle it expects to remove PIN.
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
Give CTS the handle it expects to remove PIN.

When the Direct Boot tests go to remove the PIN set in previous
tests, it needs to find the option that will remove the PIN.  Recent
changes for fingerprint caused this "none" option to be hidden, so
assign the "none" ID to the "skip" option.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug: 31160946
Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27

7 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:50:50 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoAdd search provider for system dashboard fragment.
Fan Zhang [Tue, 4 Oct 2016 00:11:11 +0000 (17:11 -0700)]
Add search provider for system dashboard fragment.

Bug: 31801428
Test: manual
Test:make RunSettingsRoboTests
Change-Id: I6a80d64ed9755f4ddcfde33a82be04cfcbf0495b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 05:19:39 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib21fca883ce256f13a62fef1e4958f961ba534c8
Auto-generated-cl: translation import

7 years agoMerge "Listen to category changes in preference fragment."
Fan Zhang [Tue, 4 Oct 2016 01:41:01 +0000 (01:41 +0000)]
Merge "Listen to category changes in preference fragment."

7 years agoMerge "Move system update preference from device_info to system."
Fan Zhang [Mon, 3 Oct 2016 23:44:57 +0000 (23:44 +0000)]
Merge "Move system update preference from device_info to system."

7 years agoListen to category changes in preference fragment.
Fan Zhang [Mon, 3 Oct 2016 20:46:22 +0000 (13:46 -0700)]
Listen to category changes in preference fragment.

Bug: 31781480
Test: make RunSettingsRoboTests
Change-Id: I702e524eb3a9e40b653e112dba80d620be3bc9bb

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
Lorenzo Colitti [Mon, 3 Oct 2016 23:37:09 +0000 (23:37 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev

7 years agoMerge "Fix a NPE when rotating dialog created by DialogCreatable."
Fan Zhang [Mon, 3 Oct 2016 22:46:37 +0000 (22:46 +0000)]
Merge "Fix a NPE when rotating dialog created by DialogCreatable."

7 years agoPrevent monkey tests from crashing with race conditions
Matthew Fritze [Mon, 3 Oct 2016 20:26:07 +0000 (13:26 -0700)]
Prevent monkey tests from crashing with race conditions

Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.

7 years agoMove system update preference from device_info to system.
Fan Zhang [Mon, 3 Oct 2016 18:05:08 +0000 (11:05 -0700)]
Move system update preference from device_info to system.

In order to move the preference and its logic cleanly, created a
controller object that encapsulates the preference/click handler.

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I332384e20fbf0e21d2f3becb531d97b20f7f7ef1

7 years agoFix a NPE when rotating dialog created by DialogCreatable.
Fan Zhang [Mon, 3 Oct 2016 20:48:55 +0000 (13:48 -0700)]
Fix a NPE when rotating dialog created by DialogCreatable.

Bug: 30088727
Test: make RunSettingsRoboTests
Change-Id: I775899809dfe920daa294f70d646b141da7c0706

7 years agoMerge "BluetoothDialog view fixed for no pair code case"
Salvador Martinez [Mon, 3 Oct 2016 19:52:12 +0000 (19:52 +0000)]
Merge "BluetoothDialog view fixed for no pair code case"

7 years agoMerge "Wrap layout content so that "Open by default" view does not scroll."
Stephen Chen [Mon, 3 Oct 2016 18:06:45 +0000 (18:06 +0000)]
Merge "Wrap layout content so that "Open by default" view does not scroll."

7 years agoMerge "Fix a NPE in confirm lock screen."
TreeHugger Robot [Mon, 3 Oct 2016 17:43:18 +0000 (17:43 +0000)]
Merge "Fix a NPE in confirm lock screen."

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
Lorenzo Colitti [Mon, 3 Oct 2016 17:28:58 +0000 (02:28 +0900)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev

Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248

7 years agoFix a NPE in confirm lock screen.
Fan Zhang [Mon, 3 Oct 2016 16:05:55 +0000 (09:05 -0700)]
Fix a NPE in confirm lock screen.

Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes: 31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 00:16:55 +0000 (09:16 +0900)]
Update text of wifi to cell autoswitch toggle

Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:55:31 +0000 (08:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 1 Oct 2016 08:54:37 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I50d10792c922453215b9af11d6867626c2ce2152
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 01:03:55 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6d295c60f83b103784c8a4729332c4a0d264b4c4
Auto-generated-cl: translation import

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2 am: c94ac39096
Matthew Fritze [Sat, 1 Oct 2016 00:40:50 +0000 (00:40 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2 am: c94ac39096
am: cbd7df8e5d

Change-Id: I5313938ff9f700ae2c941ca19fb57e991a7915ee

7 years agoPrevent double tap on suggestions am: 703dc60b14 am: ae3ad11e69
Matthew Fritze [Sat, 1 Oct 2016 00:40:35 +0000 (00:40 +0000)]
Prevent double tap on suggestions am: 703dc60b14 am: ae3ad11e69
am: 8bf5fa437e

Change-Id: I5c5dae114f51364f63fe37b6511e5bd1c376282a

7 years agoTablet Settings support tab has start/end padding am: 839be498b6 am: 4de4d8801d
Matthew Fritze [Sat, 1 Oct 2016 00:40:20 +0000 (00:40 +0000)]
Tablet Settings support tab has start/end padding am: 839be498b6 am: 4de4d8801d
am: 0d90d66c3b

Change-Id: If3f3869ea2c525475edc8428a04c6aa1461a9ab1

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev
Philip P. Moltmann [Sat, 1 Oct 2016 00:16:09 +0000 (00:16 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev

7 years agoRearrange a few settings into System category page.
Fan Zhang [Thu, 29 Sep 2016 21:37:14 +0000 (14:37 -0700)]
Rearrange a few settings into System category page.

- Use activity-alias to define which activity shows up in what category.
  We choose activity-alias because it creates a reference to UI we need
  without having to define a new set of intent-filter and/or category
  keys. This reduces maintainence in the long run. We should merge
  metadata from activity-alias into targetActivity when cleaning up.

- Created new System dashboard activity that hosts all system category
  tiles dynamically, and a static tile for checking system update.

Bug: 31781480
Test: manual
Test: make RunSettingsRoboTests -j40
Change-Id: Ia2d762e3e1aebd17423a395c5e6c286dc3326492

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
Matthew Fritze [Fri, 30 Sep 2016 22:48:12 +0000 (22:48 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
am: c94ac39096

Change-Id: I25635d1153694924fdd025b31185c9ac4ffdcff8

7 years agoPrevent double tap on suggestions am: 703dc60b14
Matthew Fritze [Fri, 30 Sep 2016 22:47:58 +0000 (22:47 +0000)]
Prevent double tap on suggestions am: 703dc60b14
am: ae3ad11e69

Change-Id: Ie53d72bf5e504cdc87d01ce0aeef1683b9d72214

7 years agoTablet Settings support tab has start/end padding am: 839be498b6
Matthew Fritze [Fri, 30 Sep 2016 22:47:45 +0000 (22:47 +0000)]
Tablet Settings support tab has start/end padding am: 839be498b6
am: 4de4d8801d

Change-Id: I47af4f65b405346e5ceae8006f7b09d4763dc8ad

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 22:41:33 +0000 (22:41 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
am: d8435d57d2

Change-Id: Ia59ca2de3d5f90bb80c62ad3615197ccefc6f461

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 22:41:32 +0000 (22:41 +0000)]
Prevent double tap on suggestions
am: 703dc60b14

Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f

7 years agoTablet Settings support tab has start/end padding
Matthew Fritze [Fri, 30 Sep 2016 22:38:23 +0000 (22:38 +0000)]
Tablet Settings support tab has start/end padding
am: 839be498b6

Change-Id: I6e58352f95e5f5947a3d4ae111f3cf4a709462b7

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 22:33:46 +0000 (22:33 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev

7 years agoUSB restriction is similar to media restriction
Philip P. Moltmann [Wed, 14 Sep 2016 20:31:26 +0000 (13:31 -0700)]
USB restriction is similar to media restriction

Bug: 31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
(cherry picked from commit 58e2b502922c525ea5f4afcb43f4d2580016b22f)

7 years agoTablet Settings support tab has start/end padding
Matthew Fritze [Wed, 28 Sep 2016 21:30:17 +0000 (14:30 -0700)]
Tablet Settings support tab has start/end padding

Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 19:36:27 +0000 (12:36 -0700)]
Prevent double tap on suggestions

Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366

7 years agoBluetoothDialog view fixed for no pair code case
Salvador Martinez [Fri, 30 Sep 2016 20:59:30 +0000 (13:59 -0700)]
BluetoothDialog view fixed for no pair code case

BluetoothPairingDialog no longer asks for a
pair code when the user only needs to
confirm that they would like to connect
to a device. Also, the layout padding
was updated a bit to make it look nicer.

Test: RunSettingsRoboTests
Bug: 31340598
Change-Id: I9394fcd53dffcff9a17fbafabdce0e94ae88fba2

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
Matthew Fritze [Fri, 30 Sep 2016 17:02:41 +0000 (17:02 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250 am: b0722aeb88
am: 3d4df23a17

Change-Id: I370874b94565d066762f2b1b8a4a46a5c4d92295

7 years agoSupport dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
Matthew Fritze [Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)]
Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
am: 1869973e12

Change-Id: I780f4b595fe276a3898237eb42d0852e7a7a5321

7 years agoMerge "resolve merge conflicts of af840b5 to master"
TreeHugger Robot [Fri, 30 Sep 2016 16:58:49 +0000 (16:58 +0000)]
Merge "resolve merge conflicts of af840b5 to master"

7 years agoresolve merge conflicts of af840b5 to master
Garfield Tan [Fri, 30 Sep 2016 00:20:27 +0000 (17:20 -0700)]
resolve merge conflicts of af840b5 to master

Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121

7 years agoMerge "Fix compile issues in Settings."
Tomasz Mikolajewski [Fri, 30 Sep 2016 00:39:53 +0000 (00:39 +0000)]
Merge "Fix compile issues in Settings."

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
Matthew Fritze [Fri, 30 Sep 2016 00:22:31 +0000 (00:22 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
am: b0722aeb88

Change-Id: Iee75b36e9c6a07bbadfebd8e561edc352492520a

7 years agoSupport dialog disclaimer text now appears properly am: adc5555acf
Matthew Fritze [Fri, 30 Sep 2016 00:22:26 +0000 (00:22 +0000)]
Support dialog disclaimer text now appears properly am: adc5555acf
am: bbe0e8a30b

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 00:20:29 +0000 (00:20 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
am: cf0f301250

Change-Id: I3279202d4e7d9e836ca5173c9f4169c92c052d15

7 years agoSupport dialog disclaimer text now appears properly
Matthew Fritze [Fri, 30 Sep 2016 00:20:27 +0000 (00:20 +0000)]
Support dialog disclaimer text now appears properly
am: adc5555acf

Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 00:12:55 +0000 (00:12 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev

7 years agoMerge "WifiCallingSettings: remove MetricsLogger"
Meng Wang [Fri, 30 Sep 2016 00:01:59 +0000 (00:01 +0000)]
Merge "WifiCallingSettings: remove MetricsLogger"

7 years agoLaunch other info in storage in correct user id. am: 493bf348b9
Garfield Tan [Thu, 29 Sep 2016 23:29:21 +0000 (23:29 +0000)]
Launch other info in storage in correct user id. am: 493bf348b9
am: 1ab4f4b816

Change-Id: I93d5222647efd84eb6c1d159c053455fbb382c13

7 years agoLaunch other info in storage in correct user id.
Garfield Tan [Thu, 29 Sep 2016 23:23:50 +0000 (23:23 +0000)]
Launch other info in storage in correct user id.
am: 493bf348b9

Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b

7 years agoSupport dialog disclaimer text now appears properly
Matthew Fritze [Thu, 29 Sep 2016 22:03:28 +0000 (15:03 -0700)]
Support dialog disclaimer text now appears properly

The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f

7 years agoLaunch other info in storage in correct user id.
Garfield Tan [Thu, 29 Sep 2016 21:14:54 +0000 (14:14 -0700)]
Launch other info in storage in correct user id.

Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee

7 years agoMerge "Use DashboardFeatureProvider to load homepage tiles."
TreeHugger Robot [Thu, 29 Sep 2016 21:19:30 +0000 (21:19 +0000)]
Merge "Use DashboardFeatureProvider to load homepage tiles."

7 years agoMerge "Reduces top space in lock password screen in sw600dp-land."
Jaewoong Jung [Thu, 29 Sep 2016 20:38:21 +0000 (20:38 +0000)]
Merge "Reduces top space in lock password screen in sw600dp-land."

7 years agoMerge "Maintain focus on switch for a11y"
TreeHugger Robot [Thu, 29 Sep 2016 20:03:47 +0000 (20:03 +0000)]
Merge "Maintain focus on switch for a11y"

7 years agoWifiCallingSettings: remove MetricsLogger
Meng Wang [Thu, 29 Sep 2016 18:36:11 +0000 (11:36 -0700)]
WifiCallingSettings: remove MetricsLogger

Test: make
Change-Id: Ifd9ac2f6b35bd851f29189c090e49c0728730ec0

7 years agoUse DashboardFeatureProvider to load homepage tiles.
Fan Zhang [Wed, 28 Sep 2016 00:51:11 +0000 (17:51 -0700)]
Use DashboardFeatureProvider to load homepage tiles.

Adding support to homepage category.

Test: SettingsRoboTests for regression. Will write tests for new feature
soon once we are set on the data structure.
Bug: 31781480

Change-Id: I25fa367fecb643f17e23f0182df7585bf1fcdd02

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 29 Sep 2016 18:54:18 +0000 (18:54 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Settings timeout for suggestions"
TreeHugger Robot [Thu, 29 Sep 2016 18:44:23 +0000 (18:44 +0000)]
Merge "Settings timeout for suggestions"

7 years agoSettings timeout for suggestions
Salvador Martinez [Tue, 20 Sep 2016 00:02:37 +0000 (17:02 -0700)]
Settings timeout for suggestions

If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.

Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0