Doris Ling
73d7773eb2
Fix visibility of AddUser when toggling multiuser.
...
- when enabling multi user, also need to update the visibility of the
Add user preference, but need to check the add user capability as well.
Change-Id: Ia243901c7537bdb39ca3a39aed559b003f803e4d
Fixes: 115397726
Test: make RunSettingsRoboTests
2018-09-12 12:33:46 -07:00
Jin Dong
c085694cc2
Changes on Settings UI for a better user experience
...
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
- "Network settings reset"
- "Factory data reset"
- "Screen pinning"
Bug: 113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
2018-09-12 12:26:18 -07:00
Bill Yi
85c82c5681
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
2018-09-12 12:07:42 -07:00
Sunny Shao
a87e4cb227
Implemented the CardContentLoader
...
- Implemented the CardContentLoader
- Refactored the CardLoader and increased the code readable
- Added try-with-resource
- Removed all custom card codes
- Modified ContextualCardManager to add CardContentLoaderCallbacks
Bug: 112521307
Test: robotest
Change-Id: Ieb9cdeaacdfb8fdae9747c60395206d15af034c1
2018-09-12 10:34:40 -07:00
TreeHugger Robot
16a71df6a3
Merge "Check for Data Usage intent before populating "Data Usage" summary."
2018-09-12 16:57:19 +00:00
Lenka Trochtova
2f4558d3fc
Revert the mandatory backups feature.
...
Bug: 79736299
Test: make RunSettingsGoogleRoboTests
Test: make RunSettingsRoboTests
Change-Id: Ie9702664c0fb4daccdee74eac6080c959fe1b608
2018-09-12 11:52:11 +02:00
Fan Zhang
d67668a1c3
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
am: 2e2e1e243d
...
am: 59cd5abb96
Change-Id: I746d5c959761306d463a934e7c01f4155934fd93
2018-09-11 18:53:09 -07:00
Fan Zhang
59cd5abb96
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
...
am: 2e2e1e243d
Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7
2018-09-11 18:49:12 -07:00
Fan Zhang
2e2e1e243d
Merge "Fix a crash when launching app detail for bad package name"
...
am: ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
2018-09-11 18:28:08 -07:00
Treehugger Robot
ada1a39ffb
Merge "Fix a crash when launching app detail for bad package name"
2018-09-12 00:57:40 +00:00
TreeHugger Robot
cd03bdd9de
Merge "Move ShadowXmlUtils to settingslib"
2018-09-11 23:53:19 +00:00
Fan Zhang
13d2551156
Fix a crash when launching app detail for bad package name
...
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests
2018-09-11 15:12:16 -07:00
Fan Zhang
acb31abf06
[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
2018-09-11 13:41:17 -07:00
Fan Zhang
8a25b25da1
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd
-s ours
...
am: 4e8e6c3e67
Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8
2018-09-11 13:27:34 -07:00
Fan Zhang
4e8e6c3e67
[automerger skipped] Merge "Add config to disable app tray preview in display size."
...
am: 98a1ebedcd
-s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
2018-09-11 13:13:33 -07:00
Fan Zhang
2ee4a4846e
Move ShadowXmlUtils to settingslib
...
Test: robotests
Change-Id: Iadea11ff207cab90a9803cb88d76b7b00b4a03df
2018-09-11 12:54:23 -07:00
TreeHugger Robot
939f3a3823
Merge "Null check for ManagedServiceSetting dialog title"
2018-09-11 19:08:54 +00:00
Fan Zhang
98a1ebedcd
Merge "Add config to disable app tray preview in display size."
2018-09-11 16:27:57 +00:00
Beverly
6543b077cb
Null check for ManagedServiceSetting dialog title
...
Test: manual
Change-Id: If3753b01431ab9690cdbae5a0d7f0edf9c80fcec
Fixes: 114803288
2018-09-11 10:06:13 -04:00
Sunny Shao
744cb8b18f
Merge "Added the bulkInsert for CardContentProvider"
2018-09-11 03:32:34 +00:00
Fan Zhang
18eecb1e67
Add config to disable app tray preview in display size.
...
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
Fan Zhang
9aca4cb48c
Add config to disable app tray preview in display size.
...
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 15:03:54 -07:00
Fan Zhang
6312aa28e3
Fix resource not found error in robolectric tests
...
Test: rerun tests
Change-Id: I5374fb39b9b10bebb5b7fe92ae9e787ac9db0deb
2018-09-10 10:25:08 -07:00
Fan Zhang
603d31f3dc
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0
-s ours am: 86e0ae5b6a
-s ours
...
am: 6097b78d62
-s ours
Change-Id: Id948f277d407440d44c94445c8dff8f763e0c440
2018-09-10 09:34:57 -07:00
Fan Zhang
6097b78d62
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0
-s ours
...
am: 86e0ae5b6a
-s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
2018-09-10 09:31:09 -07:00
Fan Zhang
86e0ae5b6a
[automerger skipped] Merge "DO NOT MERGE Import clean up."
...
am: 8a2c9e79b0
-s ours
Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
2018-09-10 09:27:07 -07:00
Fan Zhang
8a2c9e79b0
Merge "DO NOT MERGE Import clean up."
2018-09-10 15:58:34 +00:00
Sunny Shao
45a3919cf4
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
2018-09-10 11:15:35 +08:00
TreeHugger Robot
e99f4706d8
Merge "Prepare gesture to be overlayed"
2018-09-10 01:39:21 +00:00
Bill Yi
1a15a36154
[automerger skipped] Import translations. DO NOT MERGE am: 22360f9706
-s ours
...
am: 803b260bda
-s ours
Change-Id: I2bda7fc5ae150f5e5afe9e04dbdd76c516577036
2018-09-08 21:25:38 -07:00
Bill Yi
803b260bda
[automerger skipped] Import translations. DO NOT MERGE
...
am: 22360f9706
-s ours
Change-Id: I1c19e330d2c1a3d68db3ae76c501cc33f4f001ba
2018-09-08 21:21:36 -07:00
Bill Yi
22360f9706
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
2018-09-08 18:11:46 -07:00
TreeHugger Robot
698465c236
Merge changes I81990d63,I053a6220
...
* changes:
Fix settings crash if launched with null args
Fix settings crash on noti listener screen
2018-09-08 04:52:19 +00:00
TreeHugger Robot
16d523b349
Merge "Do not show AddUser if adding user is not allowed."
2018-09-08 01:22:46 +00:00
Fan Zhang
dbdaba45b9
Merge changes I341e1a12,I7986b1ca
...
* changes:
Open personal settings tab when launching homepage
Misc clean up
2018-09-07 23:00:10 +00:00
Doris Ling
e845b40f35
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
2018-09-07 14:08:49 -07:00
Fan Zhang
44be9131b1
Open personal settings tab when launching homepage
...
Change-Id: I341e1a128fda7db8f953f9a0800050cc007554c5
Fixes: 114441682
Test: manual/robotest
2018-09-07 13:44:21 -07:00
Fan Zhang
ea0b32d1ed
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
2018-09-07 12:40:47 -07:00
Julia Reynolds
cbacfc5753
Fix settings crash if launched with null args
...
Test: manual
Change-Id: I81990d63606074fc670cc39471c91ee61a73f1fc
Fixes: 73666426
2018-09-07 15:24:09 -04:00
Julia Reynolds
e4fe56e161
Fix settings crash on noti listener screen
...
Test: manual
Bug: 114417814
Change-Id: I053a62201d3e9a1066d16d4a494a0c13bebccaf7
2018-09-07 15:23:12 -04:00
jackqdyulei
d4764c8042
[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
2018-09-07 11:13:07 -07:00
jackqdyulei
d81c0c4c44
[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
2018-09-07 10:56:57 -07:00
jackqdyulei
6ec0b21544
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
am: 618b808b61
...
am: c05958ecdd
-s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
2018-09-07 10:51:10 -07:00
jackqdyulei
c05958ecdd
Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
...
am: 618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
am: ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
2018-09-07 10:42:16 -07:00
Lucas Dupin
3660fd4eae
Merge "Dark mode setting name"
2018-09-07 17:08:56 +00:00
Fan Zhang
72a7d87a65
Merge "Rename a bunch of stuff."
2018-09-07 15:48:54 +00:00
TreeHugger Robot
cfa39d3b6b
Merge "Don't update state after stop bluetooth tethering"
2018-09-07 06:20:59 +00:00
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