Commit Graph

47480 Commits

Author SHA1 Message Date
Dan Willemsen
0264904ed2 [automerger skipped] Fix imports on pi-dev-plus-aosp to fix build
am: 831768fffe  -s ours

Change-Id: I60703ad5bd5beb71eb69bcc5cb6cdc44e3f06965
2018-09-06 22:12:57 -07:00
Dan Willemsen
831768fffe Fix imports on pi-dev-plus-aosp to fix build
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-09-06 21:13:57 -07:00
TreeHugger Robot
97e4951602 Merge "Launch the new TopLevelSettings for all settings tab." 2018-09-07 02:17:17 +00:00
Fan Zhang
9d2a8e0bf5 [automerger skipped] Merge "Move safety & regulatory manual closer to legal settings" into pi-dev am: f81ec88024
am: d735f982d2  -s ours

Change-Id: Ida1b0fc4ccd3a903752151c0a9227283150cccc6
2018-09-06 18:40:20 -07:00
Fan Zhang
d735f982d2 Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am: f81ec88024

Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
2018-09-06 18:33:30 -07:00
TreeHugger Robot
f81ec88024 Merge "Move safety & regulatory manual closer to legal settings" into pi-dev 2018-09-07 01:05:45 +00:00
Fan Zhang
21526c1f80 Launch the new TopLevelSettings for all settings tab.
The new TopLevelSettings page uses a standard DashboardFragment to host
all top level settings. It's easier to maintain than DashboardSummary.

It does not support conditional cards or suggestion cards. We will use
PersonalSettingsFragment to host these as contextual cards going
forward.

Bug: 110405144
Test: visual
Change-Id: I2ab2d3556e870e86ebc18f9876336c4a3a361897
2018-09-06 18:04:05 -07:00
TreeHugger Robot
3dc29151da Merge "Fix Battery Usage graph layout for small screens" 2018-09-06 22:56:29 +00:00
Fan Zhang
48218acbd8 Merge "Switch to GridLayoutManager to support two-column layout" 2018-09-06 22:55:14 +00:00
Fan Zhang
f5ccd33567 Move safety & regulatory manual closer to legal settings
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
2018-09-06 22:50:32 +00:00
TreeHugger Robot
d8264e373f Merge "Move safety & regulatory manual closer to legal settings" 2018-09-06 21:52:34 +00:00
jackqdyulei
7644285c2c [automerger skipped] Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev am: 205479c25d
am: 04e48eae76  -s ours

Change-Id: I1eb7a863a6467bc62a0234abd291ae360cdddf6c
2018-09-06 13:33:32 -07:00
jackqdyulei
04e48eae76 Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
am: 205479c25d

Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
2018-09-06 13:14:18 -07:00
TreeHugger Robot
205479c25d Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev 2018-09-06 20:00:37 +00:00
Fan Zhang
cf8aa5ce3f Move safety & regulatory manual closer to legal settings
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
2018-09-06 12:22:05 -07:00
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
Antony Sargent
ef814b81fc Fix Battery Usage graph layout for small screens
In PowerGaugePreference, if there isn't an icon to show, we were just
adding an empty one, which causes space to be reserved and isn't what we
want on small screens.

Bug: 111318404
Test: visual (set display size to Larger or Largest, and visit Battery
page in settings; the "Last full charge" and Screen usage since full
charge" items at the bottom should not be indented)

Change-Id: I60d39836ab7d50234022a377ff6d97dde8d4c7db
2018-09-05 13:53:29 -07: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

Change-Id: Iaff158cf9588d55aa508eb7f75fe961dc5ede03a
2018-09-04 13:09:21 -07:00
tiansiming [田思明]
792ed7ffaf Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d
am: 662e59e628

Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
2018-09-04 13:05:10 -07:00
tiansiming [田思明]
662e59e628 Merge "Update string for message of DirectBootWarnDialog"
am: b0cc3a6c7d

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

Change-Id: Icb674fc30b2c442a11fd46652147ba6ec78fbe5f
2018-08-31 09:04:45 -07:00
Bill Yi
05cd61956a [automerger skipped] Import translations. DO NOT MERGE
am: 94fdfc4a44  -s ours

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

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

Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
2018-08-30 15:47:05 -07:00
Youming Ye
7c4b70c6e5 Merge "Fix the Wifi Calling back button goes to wrong screen"
am: 903d2610dd

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

Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1
2018-08-29 12:30:55 -07:00
Aurimas Liutikas
77d2f1f8ab [automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours
am: 2b0960c2d1  -s ours

Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a
2018-08-29 12:14:32 -07:00
Aurimas Liutikas
2b0960c2d1 [automerger skipped] Merge "Migrate Settings to androidx."
am: a544f17b99  -s ours

Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
2018-08-29 12:00:24 -07:00
Treehugger Robot
a544f17b99 Merge "Migrate Settings to androidx." 2018-08-29 18:31:08 +00:00