OSDN Git Service
Andreas Terzis [Fri, 6 Apr 2018 00:36:34 +0000 (17:36 -0700)]
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev am:
c91339b3ce
am:
151f765339
Change-Id: I91891db36fd4011a689b807469f92e33b88864c0
ryanywlin [Fri, 6 Apr 2018 00:34:27 +0000 (17:34 -0700)]
Merge "Add new string for sound settings" into pi-dev am:
ac119ae807
am:
7eb22b055f
Change-Id: I824820bf6528ef3d1de4c810690abae9066ba784
Andreas Terzis [Fri, 6 Apr 2018 00:16:19 +0000 (17:16 -0700)]
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
am:
c91339b3ce
Change-Id: Ic4b2dbbcd19a90cd28e0ca01c6f0cf248853b39f
ryanywlin [Fri, 6 Apr 2018 00:14:35 +0000 (17:14 -0700)]
Merge "Add new string for sound settings" into pi-dev
am:
ac119ae807
Change-Id: Id42009e9eb40398a6ff31d4903d81827ff53057e
TreeHugger Robot [Thu, 5 Apr 2018 23:41:47 +0000 (23:41 +0000)]
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
Bill Yi [Thu, 5 Apr 2018 23:35:26 +0000 (16:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
3da184f074 -s ours
am:
32cab7934a -s ours
Change-Id: I206135578fa351bb610f15ecb08705908cb8fd6f
TreeHugger Robot [Thu, 5 Apr 2018 23:33:40 +0000 (23:33 +0000)]
Merge "Add new string for sound settings" into pi-dev
Jan Nordqvist [Thu, 5 Apr 2018 23:31:40 +0000 (16:31 -0700)]
Merge "Change "X over" text color to ColorError" into pi-dev am:
22bf690fdd
am:
b2a8860b3c
Change-Id: Ibc163d39ea4b6708699ba53334d080c8258fde63
Bill Yi [Thu, 5 Apr 2018 23:24:00 +0000 (16:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3da184f074 -s ours
Change-Id: I4199238b803aa1841e096140e07c1faf4aacc274
TreeHugger Robot [Thu, 5 Apr 2018 23:12:21 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jan Nordqvist [Thu, 5 Apr 2018 23:11:16 +0000 (16:11 -0700)]
Merge "Change "X over" text color to ColorError" into pi-dev
am:
22bf690fdd
Change-Id: I97eef096124f7ad264e1d0d280e471db9d660d70
TreeHugger Robot [Thu, 5 Apr 2018 22:47:23 +0000 (22:47 +0000)]
Merge "Change "X over" text color to ColorError" into pi-dev
Salvador Martinez [Thu, 5 Apr 2018 22:43:07 +0000 (15:43 -0700)]
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev am:
148af6ba16
am:
6ae3fbb4c9
Change-Id: I4c4172c5d1170f8b52acee3f7ac1613167bbf2f6
Andreas Terzis [Fri, 30 Mar 2018 06:19:10 +0000 (23:19 -0700)]
"Data Warn & Limits" pref. summary should be empty.
The "Data Warning & Limits" preference in the Data Usage screen
should not have a summary.
Bug:
77300376
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic567e7451ac3ea102577ab96ccef3ce7de05d4ad
Salvador Martinez [Thu, 5 Apr 2018 22:20:05 +0000 (15:20 -0700)]
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev
am:
148af6ba16
Change-Id: Ib10bcb4e640d4ec1ea0cf5c3655ad5b4cb8117bf
Jan Nordqvist [Thu, 5 Apr 2018 22:18:18 +0000 (15:18 -0700)]
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev am:
3f59ce67b6
am:
eff9d43739
Change-Id: I8af506c4d7be28f8b5a966f2d4f38aeb13994b85
Lei Yu [Thu, 5 Apr 2018 22:17:32 +0000 (15:17 -0700)]
Merge "Update the anomaly type constants" into pi-dev am:
2c8a78a97c
am:
59b393ec4a
Change-Id: I5bf758b946caecb44f9000f14198eccb4f4663a7
TreeHugger Robot [Thu, 5 Apr 2018 22:07:30 +0000 (22:07 +0000)]
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev
Jan Nordqvist [Thu, 5 Apr 2018 21:54:51 +0000 (14:54 -0700)]
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev
am:
3f59ce67b6
Change-Id: Iacbae6b7552621ba9f7a064e8f3b3226006f5321
Bill Yi [Thu, 5 Apr 2018 21:54:32 +0000 (14:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
31d1b214ce -s ours
am:
d8f7641fa1 -s ours
Change-Id: I29bad934df6454c63b4d5323cef48e9d1bba0dcb
Lei Yu [Thu, 5 Apr 2018 21:54:08 +0000 (14:54 -0700)]
Merge "Update the anomaly type constants" into pi-dev
am:
2c8a78a97c
Change-Id: I151d290f46cd162c1bedc31c834cb84be6c078f6
Doris Ling [Thu, 5 Apr 2018 21:43:39 +0000 (14:43 -0700)]
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev am:
40d411abf5
am:
c9b7f8a008
Change-Id: I2f78efbac8356f5e890b5cdb5fcd38a5225a408c
Bill Yi [Thu, 5 Apr 2018 21:39:33 +0000 (14:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
31d1b214ce -s ours
Change-Id: I0ae0dba71ca1b8cfa4ceb3ade4b283f24df6be35
TreeHugger Robot [Thu, 5 Apr 2018 21:36:59 +0000 (21:36 +0000)]
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev
Bill Yi [Thu, 5 Apr 2018 21:34:11 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I08041a5d5d29533296012921a6d53956948ad527
Doris Ling [Thu, 5 Apr 2018 21:32:21 +0000 (14:32 -0700)]
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev
am:
40d411abf5
Change-Id: I617c493bdb5e2252ef9cc5321cd7e155435de264
TreeHugger Robot [Thu, 5 Apr 2018 21:23:24 +0000 (21:23 +0000)]
Merge "Update the anomaly type constants" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 21:02:51 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 20:50:06 +0000 (20:50 +0000)]
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev
Salvador Martinez [Thu, 5 Apr 2018 00:34:32 +0000 (17:34 -0700)]
Update WifiScanningRequiredFragment dialog to show help page
This CL updates the WifiScanningRequiredFragment dialog so that the
learn more button is only shown when a help page is available.
Additionally, we add the metrics constant for the dialog.
Test: robotests
Bug:
67070896
Change-Id: I7697c88b5969edaf5c06eb33251f215b776c64ee
Jan Nordqvist [Thu, 5 Apr 2018 20:22:52 +0000 (13:22 -0700)]
[automerger skipped] Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev am:
220a6a002e
am:
d19ca38ebb -s ours
Change-Id: I763e60a281843dd7766b9aff582ca117565931a7
Jan Nordqvist [Wed, 4 Apr 2018 22:54:26 +0000 (15:54 -0700)]
Do not use warning or limit to display "X B left" above usage bar
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I46f4f5f1cf6092038e49beaafe5aa6a19ffb0aa1
Felipe Leme [Thu, 5 Apr 2018 20:12:03 +0000 (13:12 -0700)]
Merge "Couple more Scoped Directory Access changes." into pi-dev am:
963a4fb59e
am:
feffcc9c10
Change-Id: I7ef5532dc41e7fa22adb0030474ac8f8d0cd05d3
Jan Nordqvist [Thu, 5 Apr 2018 20:09:43 +0000 (13:09 -0700)]
Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev
am:
220a6a002e
Change-Id: Ie8b978ee637205f5b507146f14f26fa12f5dfcda
TreeHugger Robot [Thu, 5 Apr 2018 19:59:00 +0000 (19:59 +0000)]
Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev
Bill Yi [Thu, 5 Apr 2018 19:33:14 +0000 (12:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2be2f8d5061e7b01fd97170d861d68980db9e665
Felipe Leme [Thu, 5 Apr 2018 19:26:41 +0000 (12:26 -0700)]
Merge "Couple more Scoped Directory Access changes." into pi-dev
am:
963a4fb59e
Change-Id: Ie397c6d6654f602b0f472d5023296376d4fd56af
TreeHugger Robot [Thu, 5 Apr 2018 19:02:11 +0000 (19:02 +0000)]
Merge "Couple more Scoped Directory Access changes." into pi-dev
Lei Yu [Thu, 5 Apr 2018 18:49:04 +0000 (11:49 -0700)]
Merge "Show Battery saver tip when battery saver is on" into pi-dev am:
197be04330
am:
16a0fcc6c3
Change-Id: I10516fa83c18d015fc3f9aa642313a7cb7259425
Lei Yu [Thu, 5 Apr 2018 18:40:23 +0000 (11:40 -0700)]
Merge "Fix crash in Monkey test." into pi-dev am:
d95668db99
am:
85f6fd4a1f
Change-Id: Ib8c62963b09e938143fd9382622ea3843cd88be5
Doris Ling [Thu, 5 Apr 2018 18:16:42 +0000 (11:16 -0700)]
Merge "Fix issue in ring volume sample not always being played." into pi-dev am:
1b899f2a0a
am:
284d10d112
Change-Id: I52f03ddd0686125263bc0c5e59bcc2355b7cca72
Lei Yu [Thu, 5 Apr 2018 01:06:16 +0000 (18:06 -0700)]
Update the anomaly type constants
Bug:
77323601
Test: Build
Change-Id: I0b6733edbfe12f494104f78be7087fa621191431
TreeHugger Robot [Thu, 5 Apr 2018 18:07:17 +0000 (18:07 +0000)]
Merge "Fall back to Wi-Fi data display in data usage screen with no SIM."
Lei Yu [Thu, 5 Apr 2018 18:05:58 +0000 (11:05 -0700)]
Merge "Hide uninstalled app in restrict app dialog" into pi-dev am:
2e96ec2f99
am:
bc69fe95a4
Change-Id: I7185887d29c7e46f25887e88b2559d4b556a67bb
Lei Yu [Thu, 5 Apr 2018 18:04:09 +0000 (11:04 -0700)]
Merge "Show Battery saver tip when battery saver is on" into pi-dev
am:
197be04330
Change-Id: Ic15dc8007fddf48184f7d8b59c045c88ce1db9a5
Lei Yu [Thu, 5 Apr 2018 18:03:05 +0000 (11:03 -0700)]
Merge "Fix crash in Monkey test." into pi-dev
am:
d95668db99
Change-Id: I3a7f60509095e64c6e09ae50cb900057d1369e26
Lei Yu [Thu, 5 Apr 2018 17:48:55 +0000 (17:48 +0000)]
Merge "Show Battery saver tip when battery saver is on" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 17:46:21 +0000 (17:46 +0000)]
Merge "Fix crash in Monkey test." into pi-dev
Doris Ling [Thu, 5 Apr 2018 17:33:30 +0000 (10:33 -0700)]
Merge "Fix issue in ring volume sample not always being played." into pi-dev
am:
1b899f2a0a
Change-Id: Ica29d1720bfe48a2002373cd1c85b437ed508451
Lei Yu [Thu, 5 Apr 2018 17:26:13 +0000 (10:26 -0700)]
Merge "Hide uninstalled app in restrict app dialog" into pi-dev
am:
2e96ec2f99
Change-Id: I969a25a6d73da89d15a52bb9dbbba7b016120843
Patrick Baumann [Thu, 5 Apr 2018 17:24:13 +0000 (10:24 -0700)]
Merge "Update settings to reference correct versionCode" into pi-dev am:
8d905b2f9e
am:
fd371564fd
Change-Id: I261070b81c481c30a5deddfea571c135cb1b729a
Doris Ling [Mon, 2 Apr 2018 21:51:36 +0000 (14:51 -0700)]
Update launch intent flags for settings shortcut widgets.
- earlier changes were made to the intent flags when creating new
settings shortcut to ensure that it is launching a new task. However,
ShortcutManager is actually caching existing shortcut info, and it will
continue to use the existing shortcut info unless we explicitly update
the info.
- when rebooting from build upgrade, we will go through all existing
shortcut to update the launch intent flags to ensure that the shortcut
info is update to date.
Change-Id: Iee2365d9aec64a47b193e3c9be443c252504815b
Fixes:
76395879
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 5 Apr 2018 17:12:43 +0000 (17:12 +0000)]
Merge "Fix issue in ring volume sample not always being played." into pi-dev
Lei Yu [Thu, 5 Apr 2018 16:57:13 +0000 (16:57 +0000)]
Merge "Hide uninstalled app in restrict app dialog" into pi-dev
Patrick Baumann [Thu, 5 Apr 2018 16:50:57 +0000 (09:50 -0700)]
Merge "Update settings to reference correct versionCode" into pi-dev
am:
8d905b2f9e
Change-Id: If1aeb5f9626f640302d84af19525fd545fd12de3
Jan Nordqvist [Thu, 5 Apr 2018 16:30:43 +0000 (09:30 -0700)]
Change "X over" text color to ColorError
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I2a59d6b4b4549a780ae168e9e1b3f356c677262c
TreeHugger Robot [Thu, 5 Apr 2018 16:20:25 +0000 (16:20 +0000)]
Merge "Update settings to reference correct versionCode" into pi-dev
Jan Nordqvist [Mon, 26 Mar 2018 22:29:44 +0000 (15:29 -0700)]
Fall back to Wi-Fi data display in data usage screen with no SIM.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I06bf78e54119819be87e15baca7e5b6a241958cb
Bill Yi [Thu, 5 Apr 2018 14:44:44 +0000 (07:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
4c2704847b -s ours
am:
4eb1d03b2d -s ours
Change-Id: I1b2d628885126d9c5a381776b8f97eb3585452f4
Bill Yi [Thu, 5 Apr 2018 14:38:12 +0000 (07:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
4c2704847b -s ours
Change-Id: I039a5f63c5d9bff03de16eee73da97c735824428
Bill Yi [Thu, 5 Apr 2018 14:28:37 +0000 (07:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3feadbd392d82249b0318377310b4d1155057773
Fan Zhang [Thu, 5 Apr 2018 05:09:07 +0000 (22:09 -0700)]
Merge "Fix a bug where homepage is using staled locale for tiles" into pi-dev am:
086dbda475
am:
a91023c9bc
Change-Id: I6bcb88bad6357ee4c2caba8b6a8df5147e657af0
Fan Zhang [Thu, 5 Apr 2018 05:04:06 +0000 (22:04 -0700)]
Merge "Fix a bug where homepage is using staled locale for tiles" into pi-dev
am:
086dbda475
Change-Id: Idcbd34106c66fe7eaff62495b5edbc2d6233e7b5
TreeHugger Robot [Thu, 5 Apr 2018 04:57:46 +0000 (04:57 +0000)]
Merge "Fix a bug where homepage is using staled locale for tiles" into pi-dev
Bill Yi [Thu, 5 Apr 2018 04:08:42 +0000 (21:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
295b1dba78 -s ours
am:
5f6178d44e -s ours
Change-Id: I08fcccca60f4c3272005851cc672ecd42eb0164a
Bill Yi [Thu, 5 Apr 2018 04:03:08 +0000 (21:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
295b1dba78 -s ours
Change-Id: I35d3fa9cd927047f1ea494ba8f1ab11bffcb1ecc
TreeHugger Robot [Thu, 5 Apr 2018 04:00:54 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 5 Apr 2018 03:55:05 +0000 (03:55 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Lei Yu [Wed, 4 Apr 2018 20:30:42 +0000 (13:30 -0700)]
Show Battery saver tip when battery saver is on
Before this CL, we only show "Battery Saver is on" when users turn it
on in battery tips.
In this CL, we change to constantly show this tip when battery
saver is on.
Change-Id: I9ddefdbd5818725202ddf4469b4a685ba008060a
Fixes:
75251000
Test: RunSettingsRoboTests
Bill Yi [Thu, 5 Apr 2018 01:18:03 +0000 (18:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibf6633b42d66e2c1418c2c3b719533a36c696f6a
Bill Yi [Thu, 5 Apr 2018 00:48:49 +0000 (17:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefbd29f92e79a41656a240fb99775fe741e659cc
Auto-generated-cl: translation import
Doris Ling [Thu, 5 Apr 2018 00:35:41 +0000 (17:35 -0700)]
Fix issue in ring volume sample not always being played.
- when we adjust the sound volme in Sound settings, we only re-post the
stop sample message when we receive the onSampleStarting callback.
However, if we change the volume while a sample is still playing,
onSampleStarting will not be called as it's already started. This
results in shortened sample duration, which in extreme case, the new
sample will not be played at all if the new volume change is made almost
towards the end of the previous sample period. So, everytime user change
the volume, we should re-post the stop sample message, so that the
sample playing duration would be extended properly.
- also removed the original calls to the onStreamValueChanged() during
init, as the original implementation is empty, and during init, we do
not need any handling to start/stop the sample.
Change-Id: I9f35ddfb6d809eeb83b1a732a09362286ff6ed77
Fixes:
77514234
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 4 Apr 2018 22:51:06 +0000 (15:51 -0700)]
Fix a bug where homepage is using staled locale for tiles
When setting a new locale, SettingsActivity restarts to load
everything in the new locale.
Data (containing locale specific title/summary etc) is reloaded
correctly and triggers a callback to UI to redraw.
However we skip the first callback as an optimization for app startup
time. When we restart fragment, we failed to save the state whether we
have already seen the first callback. So when data with new locale text
triggers the callback, it's being skipped and this make UI still render
in old locale.
The fix is to just save the state before fragment gets destroyed before
locale change so the callback can trigger later.
A better fix is: make data (Tile object) not cache text. Then we don't
need to worry about locale cache at all. We should do this fix in the
long term.
Test: localeswitcher
Test: adb shell am broadcast -a com.google.android.testing.i18n.localeswitcher.CHANGE_LOCALE -e LANGUAGE_TAG "zh"
Test: adb shell am broadcast -a com.google.android.testing.i18n.localeswitcher.CHANGE_LOCALE -e LANGUAGE_TAG "ja"
Fixes:
77470788
Bug:
77600770
Change-Id: Ic4223ddbb679db64d0fc3c29d16a5f61a66cc99c
Matthew Fritze [Thu, 5 Apr 2018 00:20:54 +0000 (17:20 -0700)]
Merge "Fix crash in non-indexable keys collection" into pi-dev am:
66e6e637a4
am:
acc93635c3
Change-Id: I78aab2e3b7bc6f621e2425a88f3787e29f6ec2ff
Matthew Fritze [Thu, 5 Apr 2018 00:09:56 +0000 (17:09 -0700)]
Merge "Fix crash in non-indexable keys collection" into pi-dev
am:
66e6e637a4
Change-Id: I8d493a62df0545904a6380813e32247f7f53c414
TreeHugger Robot [Wed, 4 Apr 2018 23:59:49 +0000 (23:59 +0000)]
Merge "Fix crash in non-indexable keys collection" into pi-dev
Jason Monk [Wed, 4 Apr 2018 23:45:09 +0000 (16:45 -0700)]
Merge "Updates to match prebuilts drop" into pi-dev am:
b299122e08
am:
8e51db884e
Change-Id: I790d275e30bccd446a00615149a90440d172e163
Erik Kline [Wed, 4 Apr 2018 23:05:03 +0000 (16:05 -0700)]
Merge "Expressly forbid IP string literals as Private DNS hostnames" into pi-dev am:
fe7cc296c1
am:
e0d4298210
Change-Id: Idd9b36efa49cfb103876ddf8356055c510c3a44e
Jan Nordqvist [Mon, 26 Mar 2018 22:29:44 +0000 (15:29 -0700)]
Fall back to Wi-Fi data display in data usage screen with no SIM.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I06bf78e54119819be87e15baca7e5b6a241958cb
Merged-In: I06bf78e54119819be87e15baca7e5b6a241958cb
Jason Monk [Wed, 4 Apr 2018 22:58:43 +0000 (15:58 -0700)]
Merge "Updates to match prebuilts drop" into pi-dev
am:
b299122e08
Change-Id: I7e4013fb1e3e4ffd193a83dca8ba24deefe1119b
TreeHugger Robot [Wed, 4 Apr 2018 22:40:27 +0000 (22:40 +0000)]
Merge "Updates to match prebuilts drop" into pi-dev
Erik Kline [Wed, 4 Apr 2018 22:20:27 +0000 (15:20 -0700)]
Merge "Expressly forbid IP string literals as Private DNS hostnames" into pi-dev
am:
fe7cc296c1
Change-Id: Icd5324bc389485f8f22052f5f4d285455d395780
TreeHugger Robot [Wed, 4 Apr 2018 21:30:32 +0000 (21:30 +0000)]
Merge "Expressly forbid IP string literals as Private DNS hostnames" into pi-dev
Fan Zhang [Wed, 4 Apr 2018 21:26:43 +0000 (14:26 -0700)]
Merge "Log when settings slice is requested/updated." into pi-dev am:
1400734315
am:
d820a38820
Change-Id: I9cf169cdca75fdc2b693ad2bf6ab214a796cbec2
Fan Zhang [Wed, 4 Apr 2018 21:19:44 +0000 (14:19 -0700)]
Merge "Use grey icon for work profile settings" into pi-dev am:
d3bb3945bd
am:
5b5dfb94c4
Change-Id: Ifafc0ac9a7e9d957290d9158518a997e8dd51892
Fan Zhang [Wed, 4 Apr 2018 21:00:45 +0000 (14:00 -0700)]
Merge "Log when settings slice is requested/updated." into pi-dev
am:
1400734315
Change-Id: I1372aa2ad762593e0a499e96ce742bfccfdd9d0a
TreeHugger Robot [Wed, 4 Apr 2018 20:37:15 +0000 (20:37 +0000)]
Merge "Log when settings slice is requested/updated." into pi-dev
Matthew Fritze [Wed, 4 Apr 2018 16:56:53 +0000 (09:56 -0700)]
Fix crash in non-indexable keys collection
Some of the AmbientDisplay preference controllers were
crashing when their isAvailable methods were being called
by their fragment's search index providers, which meant that
the entire collection of non-indexable keys failed. Thus,
all search results were showing up. In the case of a secondary
user, they were able to see developer options which crashed
settings when clicked.
There are two issues addressed in this cl.
1. Fix the crashes so the non-indexable keys collection works
2. Contain each fragment's collection, so that if a fragment does
crash, the damage is minimized.
Part 1 is checking that the config in isAvailable is not null,
and creating one if so.
Part 2 is fixed by surrounding the collection of non-indexable
keys in a try-catch, with an option in the catch to re-throw the
error if a system property is set. Thus, in a new pre-submit
instrumentation test, we can and docheck if any of the fragments crash
when collecting non-indexable keys.
Change-Id: I820bd9cb2649aa6faff7f82fcf575a62e41dc4fc
Fixes:
77486668
Test: atest NonIndexableCrashTest, robotests
Fan Zhang [Wed, 4 Apr 2018 20:18:15 +0000 (13:18 -0700)]
Merge "Use grey icon for work profile settings" into pi-dev
am:
d3bb3945bd
Change-Id: I9156105dfbc66fb7fdd17ea3f41885ed2e4da8b0
Patrick Baumann [Wed, 4 Apr 2018 20:17:05 +0000 (13:17 -0700)]
Update settings to reference correct versionCode
This settings change is required for a framework change that ensures
that apps built for pre-P that rely on reflection to access
ApplicationInfo#versionCode don't crash. The move to long version
code introduces a new field and all modifications of the field are
wrapped in a method that ensures both the new and old fields are set
appropriately.
Bug:
74393568
Test: manual - builds and broken app runs
Change-Id: Idfa5f85d3f91583098ebee88f0e8caecaacff9b4
TreeHugger Robot [Wed, 4 Apr 2018 20:10:11 +0000 (20:10 +0000)]
Merge "Use grey icon for work profile settings" into pi-dev
Jason Monk [Tue, 3 Apr 2018 22:36:42 +0000 (18:36 -0400)]
Updates to match prebuilts drop
Test: build
Bug:
77482321
Change-Id: I65a2cffb0a921ef6acb58ff500a7da8a8f870e76
ryanywlin [Tue, 3 Apr 2018 07:00:39 +0000 (15:00 +0800)]
Add new string for sound settings
Bug:
77254162
Test: rebuild
Change-Id: I8dc67c8efe16a8d3ad4029b41e125c3ef2f13541
Fan Zhang [Wed, 4 Apr 2018 18:20:23 +0000 (11:20 -0700)]
Fix CodeInspectionTest for Setttings am:
27fad993b4
am:
04603ff928
Change-Id: Ib07ca5e031bd750b518c248bcbc0260ec6088a9a
Anton Hansson [Wed, 4 Apr 2018 18:19:53 +0000 (11:19 -0700)]
[automerger skipped] packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE am:
47e671e148 -s ours
am:
d508e73706 -s ours
Change-Id: I495a1e05eb005ad9675fc7cf566c2a96d4b93030
Fan Zhang [Wed, 4 Apr 2018 18:08:58 +0000 (11:08 -0700)]
Fix CodeInspectionTest for Setttings
am:
27fad993b4
Change-Id: I22a28546d2f08bd118fdbbfd6c704b696c8b06c3
Anton Hansson [Wed, 4 Apr 2018 18:03:07 +0000 (11:03 -0700)]
[automerger skipped] packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE
am:
47e671e148 -s ours
Change-Id: I1fb0f356b11f5bc5887b97556d1f5e1c51980ec6
Lei Yu [Wed, 4 Apr 2018 00:25:18 +0000 (17:25 -0700)]
Fix crash in Monkey test.
When battery page is launched, BatteryTipLoader will start running.
If we rotate the screen before loader is finished, it will store null
to Bundle and will crash when restoring from that Bundle.
In this cl, we add null pointer check for tip list to avoid the crash.
Also remove a TODO since it is obsolete.
Change-Id: Ic59bc20c633f3a7467f7b5e95da062160bcb4e93
Fixes:
77534165
Test: RunSettingsRoboTests
Fan Zhang [Wed, 4 Apr 2018 16:47:39 +0000 (09:47 -0700)]
Fix CodeInspectionTest for Setttings
Bug:
77579651
Bug:
77339683
Test: robotests
Change-Id: I7cb95bc7b1a3890879809e3462d0af8ba3e53923
Anton Hansson [Wed, 28 Feb 2018 11:28:53 +0000 (11:28 +0000)]
packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841