Mill Chen
8c71a24e43
Switch to GridLayoutManager to support two-column layout
...
In order to display both half-width card and full-width card,
we use GridLayoutManager and SpanSizeLookup to achieve this purpose.
Bug: 111822407
Test: manual
Change-Id: I225fb0b5f731e3faf2bca9858395c40d318acf2f
2018-09-06 20:49:51 +08:00
Raff Tsai
76e91c8cdd
Merge "Modify Settings homepage layout"
2018-09-06 01:15:24 +00:00
Doris Ling
2ced4caff1
Remove unnecessary methods from SupportFeatureProvider.
...
Bug: 112587239
Test: make RunSettingsRoboTests
Change-Id: I7256fdbab1ae629b39cdd07da2fe813bd0fa455f
2018-09-05 18:26:10 +00:00
TSO FU WANG
ac5cfffd73
Merge ""Dsiabled" text aligns to textview right"
2018-09-05 09:11:50 +00:00
Stanley Wang
857c1ca1d1
"Dsiabled" text aligns to textview right
...
Change-Id: Id0c2b9de8355e977d1954998266079ba065c8c0b
Fixes: 112123106
Test: manual
2018-09-05 16:04:12 +08:00
Raff Tsai
43a7b18f21
Modify Settings homepage layout
...
- Add BottomNavigationView which has two tabs
- Remove BottomSheet in layout files
Change-Id: I493290fa9dee0566c73c5c9d7fbba10b71b4e2b4
Fixes: 113266753
Test: visual
2018-09-05 11:55:16 +08:00
TreeHugger Robot
7f050853c1
Merge "Add conditional cards to the new homepage."
2018-09-05 01:50:08 +00:00
TreeHugger Robot
d6d4c1681a
Merge "Fix keyguard checking when installing user certs."
2018-09-04 20:28:26 +00:00
tiansiming [田思明]
c4a378f473
Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d am: 662e59e628
...
am: 792ed7ffaf
2018-09-04 13:09:21 -07:00
tiansiming [田思明]
792ed7ffaf
Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d
...
am: 662e59e628
2018-09-04 13:05:10 -07:00
tiansiming [田思明]
662e59e628
Merge "Update string for message of DirectBootWarnDialog"
...
am: b0cc3a6c7d
2018-09-04 12:55:11 -07:00
Treehugger Robot
b0cc3a6c7d
Merge "Update string for message of DirectBootWarnDialog"
2018-09-04 19:46:18 +00:00
Pavel Grafov
1613c71248
Fix keyguard checking when installing user certs.
...
Currently the condition is inverted, so the user is asked to enroll
a password only when there is one already.
Also, use existing method instead of a duplicate one. LPU.isSecure doesn't
check the credential owner, but for unified lock with empty parent password
it will correctly return false, so should be correct.
Bug: 113646620
Test: manual, tried installing user certs with and without screen lock.
Change-Id: Iabb1614540e454873e48039be13e22cc89b0a7be
2018-09-04 18:17:04 +01:00
tiansiming [田思明]
e8dfb36df2
Update string for message of DirectBootWarnDialog
...
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.
Bug: https://partnerissuetracker.corp.google.com/u/0/issues/72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.
Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com >
2018-09-04 17:02:07 +00:00
Bill Yi
7885a0dcbe
[automerger skipped] Import translations. DO NOT MERGE am: 94fdfc4a44 -s ours
...
am: 05cd61956a
2018-08-31 09:04:45 -07:00
Bill Yi
05cd61956a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 94fdfc4a44
2018-08-31 08:56:23 -07:00
Philip P. Moltmann
8a33bd5947
Merge "RestrictedLockUtils was split into ...Internal"
2018-08-31 04:47:28 +00:00
Bill Yi
94fdfc4a44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
2018-08-30 19:02:59 -07:00
Emily Chuang
307d209322
Add conditional cards to the new homepage.
...
Make existing Settings Conditions show up in the new homepage as custom
view.
Bug: 113451905
Test: robotests
Change-Id: Ic49089f95ff04442a887cda97481e945136f7209
2018-08-31 09:34:22 +08:00
TreeHugger Robot
847865dca8
Merge "Update Settings to match Framework"
2018-08-31 01:21:07 +00:00
TreeHugger Robot
da3e0348b8
Merge "Remove the deprecated class DataUsageBase."
2018-08-31 00:41:24 +00:00
Youming Ye
639e556699
Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd am: 7c4b70c6e5
...
am: 05281b8d4b
2018-08-30 16:07:40 -07:00
Youming Ye
05281b8d4b
Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd
...
am: 7c4b70c6e5
2018-08-30 15:47:05 -07:00
Youming Ye
7c4b70c6e5
Merge "Fix the Wifi Calling back button goes to wrong screen"
...
am: 903d2610dd
2018-08-30 15:28:44 -07:00
Youming Ye
903d2610dd
Merge "Fix the Wifi Calling back button goes to wrong screen"
2018-08-30 22:03:06 +00:00
Doris Ling
22c078c8de
Remove the deprecated class DataUsageBase.
...
- and update all its subclass to extend DataUsageBaseFragment instead.
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ic5720af43082d8b39642b6a539515f3f20d32694
2018-08-30 14:16:13 -07:00
Philip P. Moltmann
e3f721132a
RestrictedLockUtils was split into ...Internal
...
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.
This causes a lot of trivial code changes.
I also updated the ordering of the imports in all affected files.
Bug: 110953302
Test: Built
make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
timhypeng
3029efc5f7
call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager
...
-add test case "onGetDeviceName"
Bug: 112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
2018-08-30 08:06:19 +00:00
Youming Ye
4f6e4bfa4f
Fix the Wifi Calling back button goes to wrong screen
...
The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.
Bug: 111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015
2018-08-29 18:28:01 -07:00
Raff Tsai
a59ce66b3b
Merge "Close searchActivity doesn't go back to previous activity"
2018-08-30 01:08:24 +00:00
Aurimas Liutikas
3b4ca98216
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours am: 2b0960c2d1 -s ours
...
am: 77d2f1f8ab
2018-08-29 12:30:55 -07:00
Aurimas Liutikas
77d2f1f8ab
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours
...
am: 2b0960c2d1
2018-08-29 12:14:32 -07:00
Aurimas Liutikas
2b0960c2d1
[automerger skipped] Merge "Migrate Settings to androidx."
...
am: a544f17b99
2018-08-29 12:00:24 -07:00
Treehugger Robot
a544f17b99
Merge "Migrate Settings to androidx."
2018-08-29 18:31:08 +00:00
Raff Tsai
4778a9afbd
Close searchActivity doesn't go back to previous activity
...
When requestCode is 0, we will not finish activity.
Change-Id: Ib630951739031b05c83efe189875a4a41c8e51ec
Fixes: 113372155
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password"
2018-08-29 23:31:42 +08:00
TreeHugger Robot
68d39ba1ee
Merge "Grant permission on slice uris based on whitelist"
2018-08-29 14:11:16 +00:00
TreeHugger Robot
a3738857da
Merge "Add null check for vrManager"
2018-08-29 10:02:09 +00:00
Kevin Chyn
76d40d3efb
Update Settings to match Framework
...
Bug: 72825012
Test: atest SettingsRoboTests
Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a
2018-08-28 21:45:01 -07:00
Fan Zhang
d480c0e41a
Grant permission on slice uris based on whitelist
...
Bug: 112587202
Test: robotests
Change-Id: I4e12a73f0acd848153f32c2569358dd55bed3f92
2018-08-28 18:13:25 -07:00
Fan Zhang
c21f4a512a
Merge "Sort imports"
2018-08-29 00:19:53 +00:00
Aurimas Liutikas
03fcde338b
Migrate Settings to androidx.
...
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0b1af85d155
2018-08-28 16:35:52 -07:00
hjchangliao
4a7c69a488
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 6e2db2c34b -s ours am: e89bf878c6 -s ours
...
am: 77e838e451
2018-08-28 15:36:05 -07:00
Colin Cross
7d9f19655b
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master am: 048f11d0a9 -s ours
...
am: 90184808c1
2018-08-28 15:17:41 -07:00
hjchangliao
77e838e451
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 6e2db2c34b -s ours
...
am: e89bf878c6
2018-08-28 15:15:25 -07:00
Android Build Merger (Role)
df1eefeb6e
Merge "[automerger skipped] Migrate Settings to androidx. am: b1af85d155 -s ours am: 44593b7bac -s ours"
2018-08-28 22:14:08 +00:00
Fan Zhang
23f8d59d02
Sort imports
...
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Aurimas Liutikas
0dfa35ad73
[automerger skipped] Migrate Settings to androidx. am: b1af85d155 -s ours
...
am: 44593b7bac
2018-08-28 15:12:27 -07:00
TreeHugger Robot
099eab1e05
Merge "Turn down app indexing for slices."
2018-08-28 22:08:41 +00:00
hjchangliao
e89bf878c6
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
...
am: 6e2db2c34b
2018-08-28 15:07:13 -07:00
Colin Cross
90184808c1
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
...
am: 048f11d0a9
2018-08-28 15:03:29 -07:00
