OSDN Git Service
Matthew Fritze [Wed, 17 May 2017 17:14:24 +0000 (17:14 +0000)]
Merge "Remove default app duplicates in search" into oc-dev
am:
0c55014b88
Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
Matthew Fritze [Wed, 17 May 2017 17:13:46 +0000 (17:13 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
am:
564b965ccc
Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6
TreeHugger Robot [Wed, 17 May 2017 17:08:11 +0000 (17:08 +0000)]
Merge "Remove default app duplicates in search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
Charles He [Wed, 17 May 2017 13:04:40 +0000 (13:04 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev
am:
98229bdf32
Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
Charles He [Wed, 17 May 2017 12:58:15 +0000 (12:58 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev
Matthew Fritze [Wed, 17 May 2017 04:46:15 +0000 (04:46 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am:
bcb2565e05
Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
TreeHugger Robot [Wed, 17 May 2017 04:34:00 +0000 (04:34 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
Matthew Fritze [Wed, 17 May 2017 02:48:24 +0000 (02:48 +0000)]
Revert "Replace dynamic summary text for SettingPref"
This reverts commit
03dfa50996d8365eb600b52999c78fec489cd371.
Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug:
36101902
Fixes:
38352100
Matthew Fritze [Tue, 16 May 2017 22:44:49 +0000 (22:44 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
am:
d6aa9f3454
Change-Id: I0ae7c3ec171d1954a362c908ea73a8a5741f2554
Charles He [Thu, 11 May 2017 18:51:46 +0000 (19:51 +0100)]
Properly remove fingerprints when removing device lock.
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.
Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.
However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.
In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().
Bug:
37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
TreeHugger Robot [Tue, 16 May 2017 22:37:21 +0000 (22:37 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
Steven Ng [Tue, 16 May 2017 21:39:54 +0000 (21:39 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours am:
6496c3757b -s ours
am:
00266d056c -s ours
Change-Id: Id573a18a0066575ef6aa53bc4b742949eb090461
Steven Ng [Tue, 16 May 2017 21:36:53 +0000 (21:36 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours
am:
6496c3757b -s ours
Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5
Steven Ng [Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am:
a2af16bb34 -s ours
am:
dde4d49385 -s ours
Change-Id: I641ab9c828bb088fa551c1d194e3676424ed1f3e
Steven Ng [Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791
am:
e05ef08a8e -s ours
Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
am:
a2af16bb34 -s ours
Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
am:
c07f39c791
Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994
Steven Ng [Tue, 16 May 2017 21:18:12 +0000 (21:18 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
Steven Ng [Tue, 16 May 2017 21:17:58 +0000 (21:17 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
Bill Yi [Tue, 16 May 2017 18:51:10 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e11a4d4e86 -s ours
Change-Id: I9e6981e64124043f872a0dd6b6679cd4b0021bf5
TreeHugger Robot [Tue, 16 May 2017 18:29:39 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Tue, 16 May 2017 17:07:34 +0000 (17:07 +0000)]
Merge "Fix a bug where storage settings flickers." into oc-dev
am:
1da7123930
Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
Daniel Nishi [Tue, 16 May 2017 17:01:29 +0000 (17:01 +0000)]
Merge "Fix a bug where storage settings flickers." into oc-dev
Shinji Sogo [Tue, 16 May 2017 15:33:36 +0000 (15:33 +0000)]
Merge "Show security info in saved network list" into oc-dev
am:
ecd1df1076
Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
TreeHugger Robot [Tue, 16 May 2017 15:25:52 +0000 (15:25 +0000)]
Merge "Show security info in saved network list" into oc-dev
Bill Yi [Tue, 16 May 2017 08:42:58 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
Matthew Fritze [Tue, 16 May 2017 00:12:07 +0000 (00:12 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev
am:
49b86b5c6a
Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
TreeHugger Robot [Mon, 15 May 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Steven Ng [Thu, 11 May 2017 17:31:08 +0000 (18:31 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Bill Yi [Sat, 13 May 2017 06:51:12 +0000 (06:51 +0000)]
Import translations. DO NOT MERGE
am:
3b2d98c714 -s ours
Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089
Bill Yi [Sat, 13 May 2017 00:11:09 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 12 May 2017 22:22:15 +0000 (22:22 +0000)]
Merge "Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97 -s ours am:
1c3120f196" into oc-dev-plus-aosp
Phil Weaver [Fri, 12 May 2017 22:21:56 +0000 (22:21 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97
am:
8f58e8b6e9 -s ours
Change-Id: Ib9fcc7305964fc16152ed86d16d42b48113b5c0d
Phil Weaver [Fri, 12 May 2017 22:21:56 +0000 (22:21 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97 -s ours
am:
1c3120f196
Change-Id: I990f591be5bc0f596c910037e362ecee84c9ed9b
Phil Weaver [Fri, 12 May 2017 22:19:53 +0000 (22:19 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c
am:
611fda4a97 -s ours
Change-Id: I1e12d774e57528af8f263e36d64af95e9d5c23b0
Phil Weaver [Fri, 12 May 2017 22:17:54 +0000 (22:17 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c
am:
611fda4a97
Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
Phil Weaver [Fri, 12 May 2017 22:16:26 +0000 (22:16 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239
am:
7f1bc85e4c
Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
Phil Weaver [Fri, 12 May 2017 22:14:22 +0000 (22:14 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a
am:
8247008239
Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
Phil Weaver [Fri, 12 May 2017 22:11:56 +0000 (22:11 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60
am:
9b8abd652a
Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
Phil Weaver [Fri, 12 May 2017 22:08:53 +0000 (22:08 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4
am:
adf8f8bc60
Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
Phil Weaver [Fri, 12 May 2017 22:07:24 +0000 (22:07 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67
am:
11b6279ed4
Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
Doris Ling [Fri, 12 May 2017 22:06:32 +0000 (22:06 +0000)]
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
am:
d821a32b8e
Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
Phil Weaver [Fri, 12 May 2017 22:05:52 +0000 (22:05 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e
am:
beb7f31d67
Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f
am:
5d6d70a50e
Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am:
9a1b4eb21f
Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
TreeHugger Robot [Fri, 12 May 2017 21:54:21 +0000 (21:54 +0000)]
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
Fan Zhang [Fri, 12 May 2017 20:42:53 +0000 (20:42 +0000)]
Merge "Add a no-op activity to handle development setting intent." into oc-dev
am:
0036ef2cf0
Change-Id: I116509d6ee62fd0633729f832cf88e4e9d9c6708
TreeHugger Robot [Fri, 12 May 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Add a no-op activity to handle development setting intent." into oc-dev
Matthew Fritze [Thu, 11 May 2017 20:32:37 +0000 (13:32 -0700)]
Remove Wallpaper duplicate from setting search
Bug:
33701673
Test: make -j40 RunSettingsRoboTests
Change-Id: I520cbc74284d92ab05b733346ee1b3115ddd8e9f
Sudheer Shanka [Fri, 12 May 2017 18:09:55 +0000 (18:09 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev
am:
129369e58e
Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d
Sudheer Shanka [Fri, 12 May 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev
Shinji Sogo [Sat, 6 May 2017 09:33:41 +0000 (18:33 +0900)]
Show security info in saved network list
When an access point linked to a saved network is not found,
security info should be shown in dialog of saved network.
Notes that in Android N this list is created with saved networks
and scan result, and that causes security info is not shown for
access points seen around user, but in Android O only saved
networks are used to create a list. That means security info is
shown for all access points listed in the screen.
Bug:
38102896
Test: make RunSettingsRoboTests
Change-Id: Ia0c5184ae7a1325f2628f4c08e29350c5793a08f
(cherry-pick of
a8382c11f58ecbfbc5b8d908b97c53d59cf774fe)
Doris Ling [Fri, 28 Apr 2017 22:17:30 +0000 (15:17 -0700)]
Change AppPrefLoader from AsyncTask to AsyncLoader.
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.
Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix:
33820327
Test: make RunSettingsRoboTests
Daniel Nishi [Mon, 8 May 2017 16:58:16 +0000 (09:58 -0700)]
Fix a bug where storage settings flickers.
The bug resulted from the fact that turning off loading while loading is
turned off causes the loading finishing animation to flicker. By only
turning it off when it is on, we ensure it works.
Change-Id: Ia31bf3e9aa90726e39b6bc7189d175c38fb51e5a
Fixes:
38045492
Test: Manual
Julia Reynolds [Fri, 12 May 2017 12:20:36 +0000 (12:20 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
am:
6393e1752f
Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
Julia Reynolds [Fri, 12 May 2017 12:14:07 +0000 (12:14 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
Amin Shaikh [Fri, 12 May 2017 06:48:13 +0000 (06:48 +0000)]
Merge changes from topic 'onarevert' into oc-dev
am:
b747be0769
Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c
Amin Shaikh [Fri, 12 May 2017 06:48:04 +0000 (06:48 +0000)]
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am:
dfa9bb8914
Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
Matthew Fritze [Fri, 12 May 2017 06:46:32 +0000 (06:46 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am:
b38c1e5353
Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
Chris Wren [Fri, 12 May 2017 05:57:49 +0000 (05:57 +0000)]
Merge "add a global control for badging" into oc-dev
am:
1425b91bac
Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
jackqdyulei [Fri, 12 May 2017 04:58:12 +0000 (04:58 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev
am:
6c680a36c5
Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
Doris Ling [Fri, 12 May 2017 04:57:40 +0000 (04:57 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
am:
d3e33ebcef
Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
Chris Wren [Fri, 12 May 2017 04:57:08 +0000 (04:57 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev
am:
72cc7b7915
Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
TreeHugger Robot [Fri, 12 May 2017 04:40:21 +0000 (04:40 +0000)]
Merge changes from topic 'onarevert' into oc-dev
* changes:
Update "Open networks available" setting.
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
Sudheer Shanka [Fri, 12 May 2017 03:56:58 +0000 (20:56 -0700)]
Update FakeUid to include new methods.
Bug:
34133340
Test: builds
Change-Id: I8c17e80002685e8e5e214d6238084584ae15ea30
TreeHugger Robot [Fri, 12 May 2017 02:04:37 +0000 (02:04 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
Chris Wren [Fri, 12 May 2017 01:49:01 +0000 (01:49 +0000)]
Merge "add a global control for badging" into oc-dev
Matthew Fritze [Fri, 12 May 2017 01:27:56 +0000 (18:27 -0700)]
Remove Special App Access duplicate from Setting search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I7f6a466c0551828c319c2da541fbeb0e428c62f8
TreeHugger Robot [Fri, 12 May 2017 01:35:22 +0000 (01:35 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 01:31:20 +0000 (01:31 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
Matthew Fritze [Thu, 11 May 2017 17:39:12 +0000 (10:39 -0700)]
Remove default app duplicates in search
Default Work Browser and Phone app search results look
identical to the regular defaults. Supress the results
until we differentiate work results.
"Assist and voice input" duplicate is a parent-child
duplication and is removed, as well.
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: I3bb75c199cd76e24de42548dd166c4bccd0c7f0a
Fan Zhang [Thu, 11 May 2017 23:04:09 +0000 (16:04 -0700)]
Add a no-op activity to handle development setting intent.
This no-op activity is only enabled when the real setting is
turned off.
Change-Id: I7ccf4645054a60569a77076c24cf42da80479fed
Fix:
37651414
Test: rerun CTS test android.systemintents.cts.TestSystemIntents#testSystemIntents
jackqdyulei [Fri, 21 Apr 2017 20:12:06 +0000 (13:12 -0700)]
Add animation for battery asyncLoader.
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug:
35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Chris Wren [Thu, 11 May 2017 21:31:45 +0000 (21:31 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev
Chris Wren [Fri, 5 May 2017 22:10:17 +0000 (18:10 -0400)]
add a global control for badging
Bug:
36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
Matthew Fritze [Mon, 8 May 2017 20:30:52 +0000 (13:30 -0700)]
Replace dynamic summary text for SettingPref
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
Julia Reynolds [Tue, 9 May 2017 14:15:51 +0000 (10:15 -0400)]
Notification settings, importance and pre-O apps
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes:
38177887
Bug:
38120923
Fixes:
38012300
Fixes:
37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
Maurice Lam [Thu, 11 May 2017 18:20:19 +0000 (18:20 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev
am:
59f965d698
Change-Id: Ia9a520419b67304342b528220a592c7629e4c1bc
Chris Wren [Thu, 11 May 2017 15:11:17 +0000 (11:11 -0400)]
allow secondary users to use notification settings
Bug:
38197667
Test: manual
Change-Id: Ib3b5f865eccc4e47ea00b190e402c3668559f427
Maurice Lam [Thu, 11 May 2017 17:35:16 +0000 (17:35 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev
Matthew Fritze [Thu, 11 May 2017 15:54:31 +0000 (08:54 -0700)]
Remove dynamic summaries for "On the lockscreen"
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
Bill Yi [Thu, 11 May 2017 01:21:10 +0000 (01:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f1730bee90 -s ours
Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65
TreeHugger Robot [Thu, 11 May 2017 00:30:30 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Stephen Chen [Thu, 11 May 2017 00:22:12 +0000 (00:22 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
am:
25d1848e5f
Change-Id: Ic83a42d3fa508b2de14ee377eed6de92970fd31c
Doris Ling [Thu, 11 May 2017 00:21:31 +0000 (00:21 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
am:
cf162d5354
Change-Id: I73133604ea118457e49def80edbdcddb553e9bcd
Roozbeh Pournader [Thu, 11 May 2017 00:21:06 +0000 (00:21 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
am:
319250b1eb
Change-Id: I868f67c90626a39c3c0dd2f4107ab9bd755bb40c
Jesse Evans [Thu, 11 May 2017 00:20:40 +0000 (00:20 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
am:
3c19120945
Change-Id: I1cfc5a19c5a133607e5ebc0731632aca25a8f044
Matthew Fritze [Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
am:
ec00573139
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
Alison Cichowlas [Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
am:
b9a2d6a6e3
Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
Daniel Nishi [Thu, 11 May 2017 00:19:20 +0000 (00:19 +0000)]
Merge "Fix the top summary layout." into oc-dev
am:
154824f124
Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
Daniel Nishi [Thu, 11 May 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
am:
9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
Maurice Lam [Tue, 9 May 2017 04:43:02 +0000 (21:43 -0700)]
Check for sidecar null-ness before removing
Test: cd tests/robotests && mma
Bug:
36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 23:39:52 +0000 (23:39 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
Bill Yi [Wed, 10 May 2017 20:48:13 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 May 2017 20:47:28 +0000 (20:47 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev