OSDN Git Service
Fan Zhang [Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)]
Merge "Fix a crash when launching app detail for bad package name" am:
ada1a39ffb am:
2e2e1e243d
am:
59cd5abb96
Change-Id: I746d5c959761306d463a934e7c01f4155934fd93
Fan Zhang [Wed, 12 Sep 2018 01:49:12 +0000 (18:49 -0700)]
Merge "Fix a crash when launching app detail for bad package name" am:
ada1a39ffb
am:
2e2e1e243d
Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7
Fan Zhang [Wed, 12 Sep 2018 01:28:08 +0000 (18:28 -0700)]
Merge "Fix a crash when launching app detail for bad package name"
am:
ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
Treehugger Robot [Wed, 12 Sep 2018 00:57:40 +0000 (00:57 +0000)]
Merge "Fix a crash when launching app detail for bad package name"
TreeHugger Robot [Tue, 11 Sep 2018 23:53:19 +0000 (23:53 +0000)]
Merge "Move ShadowXmlUtils to settingslib"
Fan Zhang [Tue, 11 Sep 2018 21:52:46 +0000 (14:52 -0700)]
Fix a crash when launching app detail for bad package name
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes:
78779901
Test: robotests
Fan Zhang [Tue, 11 Sep 2018 20:41:17 +0000 (13:41 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size." am:
98a1ebedcd -s ours am:
4e8e6c3e67
am:
8a25b25da1 -s ours
Change-Id: I0c0d0f338a724cec812d7fcc7e2bc521fc673a35
Fan Zhang [Tue, 11 Sep 2018 20:27:34 +0000 (13:27 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size." am:
98a1ebedcd -s ours
am:
4e8e6c3e67
Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8
Fan Zhang [Tue, 11 Sep 2018 20:13:33 +0000 (13:13 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size."
am:
98a1ebedcd -s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
Fan Zhang [Tue, 11 Sep 2018 19:52:45 +0000 (12:52 -0700)]
Move ShadowXmlUtils to settingslib
Test: robotests
Change-Id: Iadea11ff207cab90a9803cb88d76b7b00b4a03df
TreeHugger Robot [Tue, 11 Sep 2018 19:08:54 +0000 (19:08 +0000)]
Merge "Null check for ManagedServiceSetting dialog title"
Fan Zhang [Tue, 11 Sep 2018 16:27:57 +0000 (16:27 +0000)]
Merge "Add config to disable app tray preview in display size."
Beverly [Tue, 11 Sep 2018 14:06:13 +0000 (10:06 -0400)]
Null check for ManagedServiceSetting dialog title
Test: manual
Change-Id: If3753b01431ab9690cdbae5a0d7f0edf9c80fcec
Fixes:
114803288
Sunny Shao [Tue, 11 Sep 2018 03:32:34 +0000 (03:32 +0000)]
Merge "Added the bulkInsert for CardContentProvider"
Fan Zhang [Sat, 8 Sep 2018 00:06:07 +0000 (17:06 -0700)]
Add config to disable app tray preview in display size.
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes:
113374067
Test: robotests
Fan Zhang [Sat, 8 Sep 2018 00:06:07 +0000 (17:06 -0700)]
Add config to disable app tray preview in display size.
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Fixes:
113374067
Test: robotests
Fan Zhang [Mon, 10 Sep 2018 17:25:08 +0000 (10:25 -0700)]
Fix resource not found error in robolectric tests
Test: rerun tests
Change-Id: I5374fb39b9b10bebb5b7fe92ae9e787ac9db0deb
Fan Zhang [Mon, 10 Sep 2018 16:34:57 +0000 (09:34 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up." am:
8a2c9e79b0 -s ours am:
86e0ae5b6a -s ours
am:
6097b78d62 -s ours
Change-Id: Id948f277d407440d44c94445c8dff8f763e0c440
Fan Zhang [Mon, 10 Sep 2018 16:31:09 +0000 (09:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up." am:
8a2c9e79b0 -s ours
am:
86e0ae5b6a -s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
Fan Zhang [Mon, 10 Sep 2018 16:27:07 +0000 (09:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up."
am:
8a2c9e79b0 -s ours
Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
Fan Zhang [Mon, 10 Sep 2018 15:58:34 +0000 (15:58 +0000)]
Merge "DO NOT MERGE Import clean up."
Sunny Shao [Tue, 4 Sep 2018 06:55:54 +0000 (14:55 +0800)]
Added the bulkInsert for CardContentProvider
- Modified CardContentProvider and added bulkInsert
- Modified CardContentProviderTest
- Moved the endTransaction to finally clause
- Let insert call bulkinsert
Bug:
111820446
Test: robotest
Change-Id: Ie84fe1143abc28bb60f261ce763051bedd469100
TreeHugger Robot [Mon, 10 Sep 2018 01:39:21 +0000 (01:39 +0000)]
Merge "Prepare gesture to be overlayed"
Bill Yi [Sun, 9 Sep 2018 04:25:38 +0000 (21:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
22360f9706 -s ours
am:
803b260bda -s ours
Change-Id: I2bda7fc5ae150f5e5afe9e04dbdd76c516577036
Bill Yi [Sun, 9 Sep 2018 04:21:36 +0000 (21:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
22360f9706 -s ours
Change-Id: I1c19e330d2c1a3d68db3ae76c501cc33f4f001ba
Bill Yi [Sun, 9 Sep 2018 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
TreeHugger Robot [Sat, 8 Sep 2018 04:52:19 +0000 (04:52 +0000)]
Merge changes I81990d63,I053a6220
* changes:
Fix settings crash if launched with null args
Fix settings crash on noti listener screen
TreeHugger Robot [Sat, 8 Sep 2018 01:22:46 +0000 (01:22 +0000)]
Merge "Do not show AddUser if adding user is not allowed."
Fan Zhang [Fri, 7 Sep 2018 23:00:10 +0000 (23:00 +0000)]
Merge changes I341e1a12,I7986b1ca
* changes:
Open personal settings tab when launching homepage
Misc clean up
Doris Ling [Fri, 7 Sep 2018 21:08:49 +0000 (14:08 -0700)]
Do not show AddUser if adding user is not allowed.
- when multi user is enabled, we should keep the current visibility for
AddUser preference, since earlier check has been done to update its
visibility according to the add user capability. We should only set the
visibility to false if multi user is disabled.
Change-Id: I246e9242f255dbd57c5309b2d16c95d202607531
Fixes:
114241868
Test: make RunSettingsRoboTests
Fan Zhang [Fri, 7 Sep 2018 19:56:53 +0000 (12:56 -0700)]
Open personal settings tab when launching homepage
Change-Id: I341e1a128fda7db8f953f9a0800050cc007554c5
Fixes:
114441682
Test: manual/robotest
Fan Zhang [Fri, 7 Sep 2018 18:06:44 +0000 (11:06 -0700)]
Misc clean up
- Rename a few more things from Homepage* to ContextualCard*
- Fixed a wrong parameter that GridLayoutManager was using
Test: rebuild
Change-Id: I7986b1caf63158e876295de6d31dbbe05581664d
Julia Reynolds [Fri, 7 Sep 2018 18:14:47 +0000 (14:14 -0400)]
Fix settings crash if launched with null args
Test: manual
Change-Id: I81990d63606074fc670cc39471c91ee61a73f1fc
Fixes:
73666426
Julia Reynolds [Fri, 7 Sep 2018 17:27:08 +0000 (13:27 -0400)]
Fix settings crash on noti listener screen
Test: manual
Bug:
114417814
Change-Id: I053a62201d3e9a1066d16d4a494a0c13bebccaf7
jackqdyulei [Fri, 7 Sep 2018 18:13:07 +0000 (11:13 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61 am:
c05958ecdd -s ours am:
6ec0b21544 -s ours
am:
d81c0c4c44 -s ours
Change-Id: Iac8d9061cf1022495d528ec3d240f1793030cc9c
jackqdyulei [Fri, 7 Sep 2018 17:56:57 +0000 (10:56 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61 am:
c05958ecdd -s ours
am:
6ec0b21544 -s ours
Change-Id: I14f1f1709d94784fdb0912f1c95b625d6318b4a0
jackqdyulei [Fri, 7 Sep 2018 17:51:10 +0000 (10:51 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61
am:
c05958ecdd -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
jackqdyulei [Fri, 7 Sep 2018 17:46:08 +0000 (10:46 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e
am:
618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
jackqdyulei [Fri, 7 Sep 2018 17:42:16 +0000 (10:42 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
am:
ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
Lucas Dupin [Fri, 7 Sep 2018 17:08:56 +0000 (17:08 +0000)]
Merge "Dark mode setting name"
Fan Zhang [Fri, 7 Sep 2018 15:48:54 +0000 (15:48 +0000)]
Merge "Rename a bunch of stuff."
TreeHugger Robot [Fri, 7 Sep 2018 06:20:59 +0000 (06:20 +0000)]
Merge "Don't update state after stop bluetooth tethering"
Dan Willemsen [Fri, 7 Sep 2018 05:12:57 +0000 (22:12 -0700)]
[automerger skipped] Fix imports on pi-dev-plus-aosp to fix build
am:
831768fffe -s ours
Change-Id: I60703ad5bd5beb71eb69bcc5cb6cdc44e3f06965
Dan Willemsen [Fri, 7 Sep 2018 04:13:28 +0000 (21:13 -0700)]
Fix imports on pi-dev-plus-aosp to fix build
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
TreeHugger Robot [Fri, 7 Sep 2018 02:17:17 +0000 (02:17 +0000)]
Merge "Launch the new TopLevelSettings for all settings tab."
Fan Zhang [Fri, 7 Sep 2018 01:40:20 +0000 (18:40 -0700)]
[automerger skipped] Merge "Move safety & regulatory manual closer to legal settings" into pi-dev am:
f81ec88024
am:
d735f982d2 -s ours
Change-Id: Ida1b0fc4ccd3a903752151c0a9227283150cccc6
Fan Zhang [Fri, 7 Sep 2018 01:33:30 +0000 (18:33 -0700)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am:
f81ec88024
Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
Lucas Dupin [Fri, 7 Sep 2018 01:10:12 +0000 (18:10 -0700)]
Dark mode setting name
Bug:
109589240
Test: visual
Change-Id: Ic23ceb58140f8afda5575aad219541f05532cebe
Fan Zhang [Fri, 7 Sep 2018 00:45:50 +0000 (17:45 -0700)]
Rename a bunch of stuff.
For homepage cards, rename Homepage* to ContextualCard*.
Change-Id: I95740f15a1789683fa6c61f03ecf9bc47c367146
Fixes:
113966426
Test: robotests
TreeHugger Robot [Fri, 7 Sep 2018 01:05:45 +0000 (01:05 +0000)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
Fan Zhang [Thu, 6 Sep 2018 22:44:26 +0000 (15:44 -0700)]
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
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
TreeHugger Robot [Thu, 6 Sep 2018 22:56:29 +0000 (22:56 +0000)]
Merge "Fix Battery Usage graph layout for small screens"
Fan Zhang [Thu, 6 Sep 2018 22:55:14 +0000 (22:55 +0000)]
Merge "Switch to GridLayoutManager to support two-column layout"
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
TreeHugger Robot [Thu, 6 Sep 2018 21:52:34 +0000 (21:52 +0000)]
Merge "Move safety & regulatory manual closer to legal settings"
Lucas Dupin [Tue, 28 Aug 2018 00:27:29 +0000 (17:27 -0700)]
Prepare gesture to be overlayed
Bug:
111414690
Test: make
Change-Id: I28dbbf9b8a6a3662de273aa116ac37941fb765df
jackqdyulei [Thu, 6 Sep 2018 20:33:32 +0000 (13:33 -0700)]
[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
jackqdyulei [Thu, 6 Sep 2018 20:14:18 +0000 (13:14 -0700)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
am:
205479c25d
Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
TreeHugger Robot [Thu, 6 Sep 2018 20:00:37 +0000 (20:00 +0000)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Mill Chen [Wed, 5 Sep 2018 12:35:37 +0000 (20:35 +0800)]
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
Raff Tsai [Thu, 6 Sep 2018 01:15:24 +0000 (01:15 +0000)]
Merge "Modify Settings homepage layout"
Antony Sargent [Tue, 4 Sep 2018 21:41:21 +0000 (14:41 -0700)]
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
Doris Ling [Tue, 21 Aug 2018 21:12:57 +0000 (14:12 -0700)]
Remove unnecessary methods from SupportFeatureProvider.
Bug:
112587239
Test: make RunSettingsRoboTests
Change-Id: I7256fdbab1ae629b39cdd07da2fe813bd0fa455f
TSO FU WANG [Wed, 5 Sep 2018 09:11:50 +0000 (09:11 +0000)]
Merge ""Dsiabled" text aligns to textview right"
Stanley Wang [Wed, 29 Aug 2018 09:25:33 +0000 (17:25 +0800)]
"Dsiabled" text aligns to textview right
Change-Id: Id0c2b9de8355e977d1954998266079ba065c8c0b
Fixes:
112123106
Test: manual
Raff Tsai [Tue, 28 Aug 2018 14:02:29 +0000 (22:02 +0800)]
Modify Settings homepage layout
- Add BottomNavigationView which has two tabs
- Remove BottomSheet in layout files
Change-Id: I493290fa9dee0566c73c5c9d7fbba10b71b4e2b4
Fixes:
113266753
Test: visual
Chienyuan [Wed, 5 Sep 2018 03:10:01 +0000 (11:10 +0800)]
Don't update state after stop bluetooth tethering
After using ConnectivityManager.stopTethering(), TetheringSettings may
update state before PanService set mTetherOn to false. This makes the
toggle button checked again and user need click it twice to disable it.
Bug:
111578971
Test: on/off bluetooth tethering from settings UI
Change-Id: I6873d762d2a290080d844b7a44e54f4bd532347e
TreeHugger Robot [Wed, 5 Sep 2018 01:50:08 +0000 (01:50 +0000)]
Merge "Add conditional cards to the new homepage."
Fan Zhang [Tue, 4 Sep 2018 20:52:15 +0000 (13:52 -0700)]
DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.
Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
TreeHugger Robot [Tue, 4 Sep 2018 20:28:26 +0000 (20:28 +0000)]
Merge "Fix keyguard checking when installing user certs."
tiansiming [田思明] [Tue, 4 Sep 2018 20:09:21 +0000 (13:09 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d am:
662e59e628
am:
792ed7ffaf
Change-Id: Iaff158cf9588d55aa508eb7f75fe961dc5ede03a
tiansiming [田思明] [Tue, 4 Sep 2018 20:05:10 +0000 (13:05 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d
am:
662e59e628
Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
tiansiming [田思明] [Tue, 4 Sep 2018 19:55:11 +0000 (12:55 -0700)]
Merge "Update string for message of DirectBootWarnDialog"
am:
b0cc3a6c7d
Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
Treehugger Robot [Tue, 4 Sep 2018 19:46:18 +0000 (19:46 +0000)]
Merge "Update string for message of DirectBootWarnDialog"
Pavel Grafov [Fri, 31 Aug 2018 16:55:18 +0000 (17:55 +0100)]
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
tiansiming [田思明] [Thu, 18 Jan 2018 12:50:48 +0000 (20:50 +0800)]
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>
Bill Yi [Fri, 31 Aug 2018 16:04:45 +0000 (09:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
94fdfc4a44 -s ours
am:
05cd61956a -s ours
Change-Id: Icb674fc30b2c442a11fd46652147ba6ec78fbe5f
Bill Yi [Fri, 31 Aug 2018 15:56:23 +0000 (08:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
94fdfc4a44 -s ours
Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53
Philip P. Moltmann [Fri, 31 Aug 2018 04:47:28 +0000 (04:47 +0000)]
Merge "RestrictedLockUtils was split into ...Internal"
Bill Yi [Fri, 31 Aug 2018 02:02:59 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
Emily Chuang [Wed, 29 Aug 2018 11:47:00 +0000 (19:47 +0800)]
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
TreeHugger Robot [Fri, 31 Aug 2018 01:21:07 +0000 (01:21 +0000)]
Merge "Update Settings to match Framework"
TreeHugger Robot [Fri, 31 Aug 2018 00:41:24 +0000 (00:41 +0000)]
Merge "Remove the deprecated class DataUsageBase."
Youming Ye [Thu, 30 Aug 2018 23:07:40 +0000 (16:07 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd am:
7c4b70c6e5
am:
05281b8d4b
Change-Id: If7b7e7fab2aa0e8d81d185363685b419d5630cb1
Youming Ye [Thu, 30 Aug 2018 22:47:05 +0000 (15:47 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd
am:
7c4b70c6e5
Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
Youming Ye [Thu, 30 Aug 2018 22:28:44 +0000 (15:28 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
am:
903d2610dd
Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
Youming Ye [Thu, 30 Aug 2018 22:03:06 +0000 (22:03 +0000)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
Doris Ling [Thu, 30 Aug 2018 21:16:13 +0000 (14:16 -0700)]
Remove the deprecated class DataUsageBase.
- and update all its subclass to extend DataUsageBaseFragment instead.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: Ic5720af43082d8b39642b6a539515f3f20d32694
Philip P. Moltmann [Tue, 28 Aug 2018 22:01:43 +0000 (15:01 -0700)]
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
timhypeng [Thu, 23 Aug 2018 04:53:17 +0000 (12:53 +0800)]
call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager
-add test case "onGetDeviceName"
Bug:
112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
Youming Ye [Thu, 30 Aug 2018 01:20:22 +0000 (18:20 -0700)]
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
Raff Tsai [Thu, 30 Aug 2018 01:08:24 +0000 (01:08 +0000)]
Merge "Close searchActivity doesn't go back to previous activity"
Aurimas Liutikas [Wed, 29 Aug 2018 19:30:55 +0000 (12:30 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours am:
2b0960c2d1 -s ours
am:
77d2f1f8ab -s ours
Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1
Aurimas Liutikas [Wed, 29 Aug 2018 19:14:32 +0000 (12:14 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours
am:
2b0960c2d1 -s ours
Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a
Aurimas Liutikas [Wed, 29 Aug 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx."
am:
a544f17b99 -s ours
Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
Treehugger Robot [Wed, 29 Aug 2018 18:31:08 +0000 (18:31 +0000)]
Merge "Migrate Settings to androidx."
Raff Tsai [Wed, 29 Aug 2018 15:22:12 +0000 (23:22 +0800)]
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"
TreeHugger Robot [Wed, 29 Aug 2018 14:11:16 +0000 (14:11 +0000)]
Merge "Grant permission on slice uris based on whitelist"