OSDN Git Service
Matthew Fritze [Tue, 16 May 2017 01:56:55 +0000 (01:56 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev am:
49b86b5c6a
am:
1f21e7f325
Change-Id: Ie231837dc4ae0f4f94f326f67c06dfc2eb79ce4e
TreeHugger Robot [Tue, 16 May 2017 00:43:07 +0000 (00:43 +0000)]
Merge "Fix vpn config dialog text alignment in RTL locales"
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
TreeHugger Robot [Mon, 15 May 2017 23:33:01 +0000 (23:33 +0000)]
Merge "Code inspector test clean up."
TreeHugger Robot [Mon, 15 May 2017 22:22:57 +0000 (22:22 +0000)]
Merge "Update strings in special app access and dev options"
Fan Zhang [Mon, 15 May 2017 22:19:09 +0000 (15:19 -0700)]
Fix vpn config dialog text alignment in RTL locales
Change-Id: Ifc5a14285a337b2b168a4c6770d92f3da328b9d0
Fix:
38142136
Test: visual
Fan Zhang [Mon, 15 May 2017 21:55:47 +0000 (14:55 -0700)]
Code inspector test clean up.
Make sure code inspector tests fail if the grandfather list contains
things that no longer exists in code
Change-Id: Ib114909959040275a9d9aebd81ecbe3d96d3af03
Test: make RunSettingsRoboTests -j40
Fix:
37686032
Pankaj Kanwar [Mon, 15 May 2017 20:23:15 +0000 (20:23 +0000)]
Merge "Remove Sleep options from Advanced wifi."
Fan Zhang [Mon, 15 May 2017 18:28:25 +0000 (11:28 -0700)]
Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to
Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
user enable dev options before use.
- Add search in SpecialAccessSettings
Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix:
38290299
Fix:
37469224
Test: make RunSettingsRoboTests
TreeHugger Robot [Mon, 15 May 2017 20:12:36 +0000 (20:12 +0000)]
Merge "Add pairing preference"
jackqdyulei [Wed, 10 May 2017 21:57:16 +0000 (14:57 -0700)]
Add pairing preference
This preference lives in paired category. When clicked, it will
go to the pairing page.
Bug:
35877041
Test: RunSettingsRoboTests
Change-Id: I64706c49c8d303a494d4c1827e1f86b59effd54c
Fan Zhang [Sat, 13 May 2017 00:04:14 +0000 (17:04 -0700)]
Correctly report whether the current app is default home.
Change-Id: I79c374228e82c91667d7b5a0dcc19fa1216e57c4
Fix:
38065524
Test: make RunSettingsRoboTests
pkanwar [Tue, 9 May 2017 01:48:56 +0000 (18:48 -0700)]
Remove Sleep options from Advanced wifi.
Sleep options are not relevant any more. This CL removes them from the
settings code.
Bug:
35994481
Test: make RunSettingsRoboTests
Change-Id: Ibd0b33ded3aa2da3df73c519611c915deed6310f
Bill Yi [Sat, 13 May 2017 06:57:44 +0000 (06:57 +0000)]
Import translations. DO NOT MERGE am:
3b2d98c714 -s ours
am:
e77c92c991 -s ours
Change-Id: Ie39f8fff5d0c92826a21958abde00034b9d481db
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
TreeHugger Robot [Sat, 13 May 2017 06:21:10 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Maurice Lam [Sat, 13 May 2017 00:43:47 +0000 (00:43 +0000)]
Merge "Clean up choose lock intent creation"
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
Bill Yi [Sat, 13 May 2017 00:05:00 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0fc2f56d626dffbb2b7ca902d8c327f5a9f544c
Auto-generated-cl: translation import
Phil Weaver [Fri, 12 May 2017 23:47:03 +0000 (23:47 +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
am:
4ccb4fd19e
Change-Id: Icd1ebbacea32b3936fca27b2188b2feb22f603db
Phil Weaver [Fri, 12 May 2017 23:46:18 +0000 (23:46 +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
am:
be70654977
Change-Id: Ic03df1054b81144134968fb46fecbb07df43a823
Badhri Jagan Sridharan [Fri, 12 May 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Use StartActivityForResult to launch the intent."
Doris Ling [Fri, 12 May 2017 22:47:00 +0000 (15:47 -0700)]
Merge commit '
071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
Maurice Lam [Fri, 28 Apr 2017 23:18:47 +0000 (16:18 -0700)]
Clean up choose lock intent creation
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.
Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.
Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
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
TreeHugger Robot [Fri, 12 May 2017 21:31:06 +0000 (21:31 +0000)]
Merge "Hide app info link for "All work apps" data usage detail"
Fan Zhang [Fri, 12 May 2017 20:59:40 +0000 (20:59 +0000)]
Merge "Add a no-op activity to handle development setting intent." into oc-dev am:
0036ef2cf0
am:
2fdb45913b
Change-Id: Ib699ffe15a91fdaa1cbfbb788f4b0ee92752174a
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
Juan Lang [Fri, 12 May 2017 20:23:56 +0000 (20:23 +0000)]
Merge changes from topic 'footer-settingslib'
* changes:
Depend on SettingsLib's version of lifecycle and FooterMixin.
Add a factory method to create a Lifecycle.
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
Sudheer Shanka [Fri, 12 May 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev am:
129369e58e
am:
2c49941e5a
Change-Id: Ie6ee2d4f97d604c11c76617c427b2e4175173b92
TreeHugger Robot [Fri, 12 May 2017 18:14:44 +0000 (18:14 +0000)]
Merge "Revert "Revert "Filter and display top 3 suggestions for exclusive type"""
Fan Zhang [Fri, 12 May 2017 18:12:58 +0000 (18:12 +0000)]
Revert "Revert "Filter and display top 3 suggestions for exclusive type""
This reverts commit
184ae963e78bd70f15339d9a89542688881332db.
Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
Juan Lang [Tue, 9 May 2017 22:42:36 +0000 (15:42 -0700)]
Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.
Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
&& make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
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
Fan Zhang [Fri, 12 May 2017 18:06:48 +0000 (18:06 +0000)]
Merge "Revert "Filter and display top 3 suggestions for exclusive type""
Fan Zhang [Fri, 12 May 2017 18:03:58 +0000 (18:03 +0000)]
Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit
70b634adcff5a7d0f453ddaedfd2c772b29d8757.
Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
Sudheer Shanka [Fri, 12 May 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev
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
TreeHugger Robot [Fri, 12 May 2017 17:28:30 +0000 (17:28 +0000)]
Merge "Filter and display top 3 suggestions for exclusive type"
Fan Zhang [Wed, 10 May 2017 17:06:02 +0000 (10:06 -0700)]
Hide app info link for "All work apps" data usage detail
We should hide the link because "All work apps" is a meta app, it
doesn't point to any specific app, so app info link does not make sense.
Change-Id: I768786f2df5d05bbde0723e5585abcdbe875c652
Fix:
36542896
Test: make RunSettingsRoboTests
Adrian Roos [Fri, 12 May 2017 16:40:08 +0000 (16:40 +0000)]
Merge "AOD: Add temporary always-on setting"
Juan Lang [Wed, 10 May 2017 16:18:39 +0000 (09:18 -0700)]
Add a factory method to create a Lifecycle.
Some unit tests in other packages want to override the mLifecycle member
with their own value. When the Lifecycle class moves into SettingsLib,
the classpath of ObservableDialogFragment and Lifecycle have to remain
consistent. This change allows dependent classes to remain agnostic to
Lifecycle's classpath.
Test: make RunSettingsGoogleRoboTests && make RunSettingsLibRoboTests &&
make RunSettingsRoboTests
Change-Id: I594e447741aeeb3ba95afb4044d496b1540bd92c
Fan Zhang [Thu, 11 May 2017 22:39:38 +0000 (15:39 -0700)]
Filter and display top 3 suggestions for exclusive type
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix:
37947647
Test: make RunSettingsRoboTests
Julia Reynolds [Fri, 12 May 2017 12:28:35 +0000 (12:28 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev am:
6393e1752f
am:
237eb88434
Change-Id: Ie8c6262c35b79259974ffe069b37b2e6d2507b50
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 09:00:33 +0000 (09:00 +0000)]
Merge changes from topic 'onarevert' into oc-dev am:
b747be0769
am:
8485562ded
Change-Id: Ifb18d7f498cca6e51922460b516650982dbedabd
Amin Shaikh [Fri, 12 May 2017 09:00:24 +0000 (09:00 +0000)]
Revert "Update "Open networks available" toggle to instead open notification channel preferences." am:
dfa9bb8914
am:
c3666f1c35
Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
Matthew Fritze [Fri, 12 May 2017 08:59:41 +0000 (08:59 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am:
b38c1e5353
am:
01f5f5d5c9
Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
Chris Wren [Fri, 12 May 2017 08:59:11 +0000 (08:59 +0000)]
Merge "add a global control for badging" into oc-dev am:
1425b91bac
am:
aebf049b4f
Change-Id: I68417e74c7a46cf6283529f17a5f3f9d5547354a
jackqdyulei [Fri, 12 May 2017 08:58:41 +0000 (08:58 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev am:
6c680a36c5
am:
4b749c2b0a -s ours
Change-Id: Ic9916764c661041609a80ffe4edc35406ff10cad
Doris Ling [Fri, 12 May 2017 08:58:02 +0000 (08:58 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev am:
d3e33ebcef
am:
93ff2d69f1
Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2
Chris Wren [Fri, 12 May 2017 08:57:05 +0000 (08:57 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev am:
72cc7b7915
am:
715f096678
Change-Id: I164b72d8bcff91e563b70ad6d7051b4617bc46b2
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
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
Adrian Roos [Wed, 10 May 2017 20:26:25 +0000 (13:26 -0700)]
AOD: Add temporary always-on setting
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.
Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.
Also adds tests for both doze preference controllers.
Bug:
33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
TreeHugger Robot [Thu, 11 May 2017 23:45:26 +0000 (23:45 +0000)]
Merge "Add bluetooth visible item"
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
TreeHugger Robot [Thu, 11 May 2017 23:06:57 +0000 (23:06 +0000)]
Merge "Add animation for battery asyncLoader."
TreeHugger Robot [Thu, 11 May 2017 22:41:11 +0000 (22:41 +0000)]
Merge "Refactor choose lock password scrolling"
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
Bill Yi [Thu, 11 May 2017 21:47:39 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Maurice Lam [Fri, 28 Apr 2017 02:04:46 +0000 (19:04 -0700)]
Refactor choose lock password scrolling
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.
Bug:
38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
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
Maurice Lam [Thu, 11 May 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev am:
59f965d698
am:
7e60ce0109
Change-Id: I7551cd4c9d045f274ceac271da71667aeb275966
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
jackqdyulei [Tue, 25 Apr 2017 20:32:02 +0000 (13:32 -0700)]
Add bluetooth visible item
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.
This cl creates a preference controller to handle the logic for
device name preference.
Bug:
35876447
Test: RunSettingsRoboTests
Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
Bill Yi [Thu, 11 May 2017 18:10:10 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
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
OSDN Git Service
