Fan Zhang
1d4495f985
Merge "Update signature when calling CategoryManager.get."
2016-10-05 00:14:54 +00:00
Fan Zhang
6ede9fbd83
Merge "Add storage dashborad page."
2016-10-05 00:10:27 +00:00
Jeff Sharkey
d89ef643ab
Merge "Give CTS the handle it expects to remove PIN."
2016-10-04 22:19:36 +00:00
Fan Zhang
1fb1526af7
Update signature when calling CategoryManager.get.
...
Bug: 31781480
Test: compiles
Change-Id: Iee715aca3767a67728527ba9390787d3f8a7e5fe
2016-10-04 15:18:02 -07:00
Fan Zhang
bb6d2608e9
Add storage dashborad page.
...
Refactor shared dashboard page display logic between storage and
system page.
Bug: 31800690
Test: RunSettingsRoboTests
Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193
2016-10-04 14:06:57 -07:00
Fan Zhang
27991718e5
Merge "Add search provider for system dashboard fragment."
2016-10-04 19:52:15 +00:00
Jeff Sharkey
159dff63a5
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
2016-10-04 13:45:38 -06:00
Bill Yi
ac5b6b0f15
Merge "Import translations. DO NOT MERGE"
2016-10-04 18:50:51 +00:00
Fan Zhang
c6540cfb57
Add search provider for system dashboard fragment.
...
Bug: 31801428
Test: manual
Test:make RunSettingsRoboTests
Change-Id: I6a80d64ed9755f4ddcfde33a82be04cfcbf0495b
2016-10-04 11:10:36 -07:00
Bill Yi
319b2ede7c
Import translations. DO NOT MERGE
...
Change-Id: Ib21fca883ce256f13a62fef1e4958f961ba534c8
Auto-generated-cl: translation import
2016-10-03 22:19:39 -07:00
Fan Zhang
9574fb805a
Merge "Listen to category changes in preference fragment."
2016-10-04 01:41:05 +00:00
Fan Zhang
a3e77342d9
Merge "Move system update preference from device_info to system."
2016-10-03 23:44:58 +00:00
Fan Zhang
81adfcfcca
Listen to category changes in preference fragment.
...
Bug: 31781480
Test: make RunSettingsRoboTests
Change-Id: I702e524eb3a9e40b653e112dba80d620be3bc9bb
2016-10-03 16:38:02 -07:00
Fan Zhang
1a5de69405
Merge "Fix a NPE when rotating dialog created by DialogCreatable."
2016-10-03 22:46:38 +00:00
Fan Zhang
9c1fcf9916
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
2016-10-03 13:53:45 -07:00
Fan Zhang
4fe7c0859f
Fix a NPE when rotating dialog created by DialogCreatable.
...
Bug: 30088727
Test: make RunSettingsRoboTests
Change-Id: I775899809dfe920daa294f70d646b141da7c0706
2016-10-03 13:50:59 -07:00
Salvador Martinez
32fd735a1c
Merge "BluetoothDialog view fixed for no pair code case"
2016-10-03 19:52:12 +00:00
Stephen Chen
8fdb96e32e
Merge "Wrap layout content so that "Open by default" view does not scroll."
2016-10-03 18:06:46 +00:00
TreeHugger Robot
bd2322afe4
Merge "Fix a NPE in confirm lock screen."
2016-10-03 17:43:19 +00:00
Fan Zhang
774e1d8443
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
2016-10-03 09:05:55 -07:00
TreeHugger Robot
ef6a718638
Merge "Import translations. DO NOT MERGE"
2016-10-01 08:54:38 +00:00
Bill Yi
d47f99a752
Import translations. DO NOT MERGE
...
Change-Id: I6d295c60f83b103784c8a4729332c4a0d264b4c4
Auto-generated-cl: translation import
2016-09-30 18:03:55 -07:00
Matthew Fritze
f1435271f5
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2 am: c94ac39096
...
am: cbd7df8e5d
2016-10-01 00:40:50 +00:00
Matthew Fritze
f14f54f128
Prevent double tap on suggestions am: 703dc60b14 am: ae3ad11e69
...
am: 8bf5fa437e
2016-10-01 00:40:35 +00:00
Matthew Fritze
2709fdfcd5
Tablet Settings support tab has start/end padding am: 839be498b6 am: 4de4d8801d
...
am: 0d90d66c3b
2016-10-01 00:40:20 +00:00
Fan Zhang
cc335d9509
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
2016-09-30 16:03:46 -07:00
Matthew Fritze
cbd7df8e5d
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
...
am: c94ac39096
2016-09-30 22:48:12 +00:00
Matthew Fritze
8bf5fa437e
Prevent double tap on suggestions am: 703dc60b14
...
am: ae3ad11e69
2016-09-30 22:47:58 +00:00
Matthew Fritze
0d90d66c3b
Tablet Settings support tab has start/end padding am: 839be498b6
...
am: 4de4d8801d
2016-09-30 22:47:45 +00:00
Matthew Fritze
c94ac39096
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
...
am: d8435d57d2
2016-09-30 22:41:33 +00:00
Matthew Fritze
ae3ad11e69
Prevent double tap on suggestions
...
am: 703dc60b14
2016-09-30 22:41:32 +00:00
Matthew Fritze
4de4d8801d
Tablet Settings support tab has start/end padding
...
am: 839be498b6
2016-09-30 22:38:23 +00:00
TreeHugger Robot
d8435d57d2
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
2016-09-30 22:33:46 +00:00
Matthew Fritze
839be498b6
Tablet Settings support tab has start/end padding
...
Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection
2016-09-30 21:16:30 +00:00
Matthew Fritze
703dc60b14
Prevent double tap on suggestions
...
Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366
2016-09-30 14:13:53 -07:00
Salvador Martinez
4d279a56f5
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
2016-09-30 21:04:20 +00:00
Matthew Fritze
9fc9f0f177
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250 am: b0722aeb88
...
am: 3d4df23a17
2016-09-30 17:02:41 +00:00
Matthew Fritze
2fb386ac8f
Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
...
am: 1869973e12
2016-09-30 17:02:27 +00:00
TreeHugger Robot
91a4c542d1
Merge "resolve merge conflicts of af840b5 to master"
2016-09-30 16:58:49 +00:00
Garfield Tan
dbd039a6de
resolve merge conflicts of af840b5 to master
...
Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121
2016-09-29 18:08:25 -07:00
Tomasz Mikolajewski
3260ef8be0
Merge "Fix compile issues in Settings."
2016-09-30 00:39:53 +00:00
Matthew Fritze
3d4df23a17
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
...
am: b0722aeb88
2016-09-30 00:22:31 +00:00
Matthew Fritze
1869973e12
Support dialog disclaimer text now appears properly am: adc5555acf
...
am: bbe0e8a30b
2016-09-30 00:22:26 +00:00
Matthew Fritze
b0722aeb88
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
...
am: cf0f301250
2016-09-30 00:20:29 +00:00
Matthew Fritze
bbe0e8a30b
Support dialog disclaimer text now appears properly
...
am: adc5555acf
2016-09-30 00:20:27 +00:00
Matthew Fritze
cf0f301250
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
2016-09-30 00:12:55 +00:00
Meng Wang
c77206f536
Merge "WifiCallingSettings: remove MetricsLogger"
2016-09-30 00:02:00 +00:00
Garfield Tan
af840b584d
Launch other info in storage in correct user id. am: 493bf348b9
...
am: 1ab4f4b816
2016-09-29 23:29:21 +00:00
Garfield Tan
1ab4f4b816
Launch other info in storage in correct user id.
...
am: 493bf348b9
2016-09-29 23:23:50 +00:00
Matthew Fritze
adc5555acf
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
2016-09-29 22:32:10 +00:00
