OSDN Git Service
Peter Qiu [Fri, 31 Mar 2017 18:04:17 +0000 (18:04 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev am:
82e2239c54
am:
1599dde849
Change-Id: I242b555fabaed85a72e4f1d38b177cd90071c371
Peter Qiu [Fri, 31 Mar 2017 17:58:58 +0000 (17:58 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
am:
82e2239c54
Change-Id: I5746669f3e2f2157548979d9317bbe6a225bb715
TreeHugger Robot [Fri, 31 Mar 2017 17:54:13 +0000 (17:54 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 09:25:24 +0000 (09:25 +0000)]
Merge "Device management info: Refer to current user, not primary user"
Bill Yi [Fri, 31 Mar 2017 02:10:12 +0000 (02:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e52758588a -s ours
am:
e049c3523f -s ours
Change-Id: I7a46c24127ca51b64028771b53dbf9990ca6593f
Bill Yi [Fri, 31 Mar 2017 02:06:22 +0000 (02:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e52758588a -s ours
Change-Id: I6e9cbf23b8f49ad32a30092021485a54f1e076dc
TreeHugger Robot [Fri, 31 Mar 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Wei Huang [Fri, 31 Mar 2017 01:23:40 +0000 (01:23 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev am:
e1b12751cb
am:
e790338ed6
Change-Id: I0bc5fe6832ffd03e65d89630e0e99d87550ba71a
Wei Huang [Fri, 31 Mar 2017 01:05:17 +0000 (01:05 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev
am:
e1b12751cb
Change-Id: I82b8798e64b4b7f9958e3e88a7fe195df57e3549
TreeHugger Robot [Fri, 31 Mar 2017 01:00:16 +0000 (01:00 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev
Amin Shaikh [Fri, 31 Mar 2017 00:05:46 +0000 (00:05 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev am:
6889ac21ab
am:
ad47cd05c7
Change-Id: I17cde24b9367d0fa0fec8347856636f28d839f09
Amin Shaikh [Fri, 31 Mar 2017 00:03:48 +0000 (00:03 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev
am:
6889ac21ab
Change-Id: I2e019122d85b00f700f64cb18c0a6d3f35709ac0
TreeHugger Robot [Thu, 30 Mar 2017 23:59:33 +0000 (23:59 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev
Wei Huang [Mon, 23 Jan 2017 11:26:20 +0000 (20:26 +0900)]
Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug:
34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
Amit Mahajan [Thu, 30 Mar 2017 22:12:41 +0000 (22:12 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de am:
33e9e31a3d am:
9df297d566
am:
7e09d39dd9
Change-Id: I2125086775f801ec35c49d8e49e1cf87a11bb5a1
Amit Mahajan [Thu, 30 Mar 2017 22:10:42 +0000 (22:10 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de am:
33e9e31a3d
am:
9df297d566
Change-Id: I152d6451b5da34880b476e15fe7d6ce95a3fe0b4
Bill Yi [Thu, 30 Mar 2017 22:09:46 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic117b670e525612d9f243eff4f151d9ee616d198
Auto-generated-cl: translation import
Amit Mahajan [Thu, 30 Mar 2017 22:08:12 +0000 (22:08 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de
am:
33e9e31a3d
Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
Amit Mahajan [Thu, 30 Mar 2017 22:05:41 +0000 (22:05 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
am:
a604afe5de
Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
Amit Mahajan [Thu, 30 Mar 2017 21:59:33 +0000 (21:59 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
Amin Shaikh [Thu, 30 Mar 2017 21:44:42 +0000 (14:44 -0700)]
Fix write wifi config to nfc.
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.
Bug:
35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
Bartosz Fabianowski [Thu, 30 Mar 2017 20:10:54 +0000 (20:10 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev am:
b9f570ff44
am:
103a72a9eb
Change-Id: Ifdbaeb05fd497bfa58c2e6f4abe89e420d7de2cf
Bartosz Fabianowski [Thu, 30 Mar 2017 20:06:57 +0000 (20:06 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev
am:
b9f570ff44
Change-Id: I14c2b9e37201e478e28fba96494bee807134b32c
TreeHugger Robot [Thu, 30 Mar 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev
Stephen Chen [Thu, 30 Mar 2017 18:25:32 +0000 (18:25 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev am:
0df5281fe6
am:
659c66a3ca
Change-Id: I89b6bdfabf841f8027ae5c6870ec9ec40b8388bc
Stephen Chen [Thu, 30 Mar 2017 18:23:46 +0000 (18:23 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
am:
0df5281fe6
Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
Stephen Chen [Thu, 30 Mar 2017 18:20:50 +0000 (18:20 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev am:
555d12b427
am:
69bc8c5632
Change-Id: I1922192819c9e1e0db12507c4580833529d6286b
TreeHugger Robot [Thu, 30 Mar 2017 18:19:43 +0000 (18:19 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
Stephen Chen [Thu, 30 Mar 2017 18:15:04 +0000 (18:15 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev
am:
555d12b427
Change-Id: I3f35dda59aaec348998dc86c2f7b7874917c6719
TreeHugger Robot [Thu, 30 Mar 2017 18:08:46 +0000 (18:08 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev
Robin Lee [Thu, 30 Mar 2017 18:06:45 +0000 (18:06 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am:
73455096d7
am:
a0e34f020a
Change-Id: Ic95e31908525fb12c83e010352260d42cc2738b0
Robin Lee [Thu, 30 Mar 2017 18:03:56 +0000 (18:03 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
am:
73455096d7
Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
TreeHugger Robot [Thu, 30 Mar 2017 17:57:15 +0000 (17:57 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
Lei Yu [Thu, 30 Mar 2017 17:47:24 +0000 (17:47 +0000)]
Merge "Update string for battery main page" into oc-dev am:
dd0e0b4506
am:
ab315ddb4b
Change-Id: I3a76075bf98778a697d806cee180c432f8a45e39
Lei Yu [Thu, 30 Mar 2017 17:32:45 +0000 (17:32 +0000)]
Merge "Update string for battery main page" into oc-dev
am:
dd0e0b4506
Change-Id: I1eb0d3cf8859fe9c82d18a799312fe378319ad5a
Lei Yu [Thu, 30 Mar 2017 17:20:40 +0000 (17:20 +0000)]
Merge "Update string for battery main page" into oc-dev
Matthew Fritze [Thu, 30 Mar 2017 16:58:10 +0000 (16:58 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev am:
1261a679bf
am:
64142d2f7a
Change-Id: Ice26ec2570c0aede992078dab213d7f1576a87c3
Julia Reynolds [Thu, 30 Mar 2017 16:57:56 +0000 (16:57 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev am:
42b16f2f08
am:
4be53f45ca
Change-Id: I29e70e705525b5ab22dde025ecbbe64d72389980
Matthew Fritze [Thu, 30 Mar 2017 16:51:04 +0000 (16:51 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev
am:
1261a679bf
Change-Id: Ia08fd77a634efd19a13982f1c4f89501e6a24c4f
Julia Reynolds [Thu, 30 Mar 2017 16:50:50 +0000 (16:50 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev
am:
42b16f2f08
Change-Id: I330f11ba0a09de72ee24adacccb7a18ab2e2d613
TreeHugger Robot [Thu, 30 Mar 2017 16:48:52 +0000 (16:48 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev
Julia Reynolds [Thu, 30 Mar 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev
Robin Lee [Thu, 30 Mar 2017 14:13:07 +0000 (15:13 +0100)]
VPN: uncheck lockdown if always-on is off
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix:
36713605
Test: make RunSettingsRoboTests -j30
TreeHugger Robot [Thu, 30 Mar 2017 14:39:34 +0000 (14:39 +0000)]
Merge "Remove unused xml file."
Julia Reynolds [Thu, 30 Mar 2017 14:29:02 +0000 (10:29 -0400)]
Redirect zen mode suggestion
Test: manual, click on DND suggestion
Bug:
36737163
Change-Id: I67f0ed801b05bb502af21952aa2050ae5e09df88
Bartosz Fabianowski [Thu, 30 Mar 2017 08:33:28 +0000 (10:33 +0200)]
Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
Wei Huang [Mon, 23 Jan 2017 11:26:20 +0000 (20:26 +0900)]
Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug:
34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
Niels Egberts [Thu, 30 Mar 2017 10:06:37 +0000 (11:06 +0100)]
Remove unused xml file.
Bug:
36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
Bartosz Fabianowski [Fri, 24 Mar 2017 17:32:50 +0000 (18:32 +0100)]
Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.
Bug:
32692748
Test: None
Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
(cherry picked from commit
28a03aeb4854685fe30c334eea4f538da563a1e9)
Bill Yi [Thu, 30 Mar 2017 02:01:15 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a53f8a9128 -s ours
am:
92547f4b39 -s ours
Change-Id: Ib98981df6ecefe159ea9b394e29ed8c94d19475c
Bill Yi [Thu, 30 Mar 2017 01:52:16 +0000 (01:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a53f8a9128 -s ours
Change-Id: I98c71241176416c95e810bc5e4b57e6150173dde
TreeHugger Robot [Thu, 30 Mar 2017 01:39:01 +0000 (01:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:26:53 +0000 (01:26 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev am:
1c087983d8
am:
f18b5b3b05
Change-Id: I74908eb60bbbb14cfc53e9aabf8d17c4dca342b6
Pavlin Radoslavov [Thu, 30 Mar 2017 01:21:31 +0000 (01:21 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
am:
1c087983d8
Change-Id: I2c4b84b472085c02fcd68208ca7fdc1e2ffa165c
Lei Yu [Thu, 30 Mar 2017 01:20:37 +0000 (01:20 +0000)]
Merge "Hide Wifi and Systemui in settings main page" into oc-dev am:
ae179f182f
am:
716101dfca
Change-Id: I52ea211216408e569489e244092228a0c1992964
Lei Yu [Thu, 30 Mar 2017 01:20:22 +0000 (01:20 +0000)]
Merge "Add summary for categories in battery advanced page" into oc-dev am:
b2e213d551
am:
743cd6f142
Change-Id: I1429f16211b33193b78d492271ae23c3a693a578
Lei Yu [Thu, 30 Mar 2017 01:18:15 +0000 (01:18 +0000)]
Merge "Hide Wifi and Systemui in settings main page" into oc-dev
am:
ae179f182f
Change-Id: Ib5df3df7e9c86a23149496cf4672ac696ff8eb74
Lei Yu [Thu, 30 Mar 2017 01:18:01 +0000 (01:18 +0000)]
Merge "Add summary for categories in battery advanced page" into oc-dev
am:
b2e213d551
Change-Id: Iebc74d977b081d45bd8b9220b941c62851e2acaa
TreeHugger Robot [Thu, 30 Mar 2017 01:17:20 +0000 (01:17 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
Lei Yu [Thu, 30 Mar 2017 01:14:35 +0000 (01:14 +0000)]
Merge "Hide Wifi and Systemui in settings main page" into oc-dev
Lei Yu [Thu, 30 Mar 2017 01:14:24 +0000 (01:14 +0000)]
Merge "Add summary for categories in battery advanced page" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 00:06:34 +0000 (00:06 +0000)]
Merge "Adds the lightning badge for Instant Apps"
Matthew Fritze [Tue, 28 Mar 2017 00:42:36 +0000 (17:42 -0700)]
Reserve full indexing for SearchFragment
Full Index should only be accessible from Search Fragment,
and when only full index should declare a locale to be
indexed.
Test: make RunSettingsRoboTests
Fixes:
36656637
Change-Id: Ie673067118ac6b184570e116ea24a169be027053
Stephen Chen [Wed, 29 Mar 2017 23:53:45 +0000 (16:53 -0700)]
Do not show progress bar when disabling wifi.
Bug:
34286786
Test: make, test on device.
Change-Id: I109ac05ce3565abc3d80ecec2879c2f7c8bc1724
Bill Yi [Wed, 29 Mar 2017 23:33:00 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb35af37750b62e22f828448b8230dc67b2de5c2
Auto-generated-cl: translation import
Stephen Chen [Wed, 29 Mar 2017 21:35:06 +0000 (14:35 -0700)]
Add link speed to Wifi details page.
Also make detail items unselectable.
Bug:
36444504
Test: make RunSettingsRoboTests
Change-Id: I393a3a25c8c036da1df1dc2788accfecb3563e14
Lei Yu [Wed, 29 Mar 2017 23:20:44 +0000 (23:20 +0000)]
Merge "Create Controller for app buttons" into oc-dev am:
88b57826f5
am:
311593a89b
Change-Id: Ica736c18bdc5bbfc79dd9a85112e2c949aa529c4
Lei Yu [Wed, 29 Mar 2017 23:18:45 +0000 (23:18 +0000)]
Merge "Create Controller for app buttons" into oc-dev
am:
88b57826f5
Change-Id: I62b837278d68fafe5bbe7faaa968fda18a5c9453
Lei Yu [Wed, 29 Mar 2017 23:16:29 +0000 (23:16 +0000)]
Merge "Create Controller for app buttons" into oc-dev
Pavlin Radoslavov [Wed, 29 Mar 2017 23:04:12 +0000 (23:04 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
eeabd6b463 am:
bc9c1d0eb8 am:
30547ce3e8
am:
d246b714d0
Change-Id: Iaf1923ee54e67530bc8159fab9c05605401aac05
Pavlin Radoslavov [Fri, 24 Feb 2017 18:25:09 +0000 (10:25 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
(cherry picked from commit
b0d8cdf8f81070dd2384f7ab756d0afdc1384107)
Pavlin Radoslavov [Wed, 29 Mar 2017 22:57:39 +0000 (22:57 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
eeabd6b463 am:
bc9c1d0eb8
am:
30547ce3e8
Change-Id: I94706c37d395011fdc7c7d25d4a8426dc7af6d8f
Maurice Lam [Wed, 29 Mar 2017 22:56:52 +0000 (22:56 +0000)]
Merge "Allow remote views to be used in Tiles"
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:53 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
eeabd6b463
am:
bc9c1d0eb8
Change-Id: I3b89011d02f159d951b39ddc8d43cb17fbd00432
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:40 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
eeabd6b463
Change-Id: I1ead14c5b587c9934fcd1fff450221cf83c16a3d
Christine Franks [Wed, 29 Mar 2017 22:47:13 +0000 (22:47 +0000)]
Merge "Disable default indicator for night display" into oc-dev am:
231ed14e46
am:
58cbd30873
Change-Id: Ib6aaaad468213b1226c91f8212b7a206de1964fe
Christine Franks [Wed, 29 Mar 2017 22:45:13 +0000 (22:45 +0000)]
Merge "Disable default indicator for night display" into oc-dev
am:
231ed14e46
Change-Id: Ibf1034bf8edff6ad54a10c4d46b8740bbe685dea
Christine Franks [Wed, 29 Mar 2017 22:41:40 +0000 (22:41 +0000)]
Merge "Disable default indicator for night display" into oc-dev
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
TreeHugger Robot [Wed, 29 Mar 2017 22:36:56 +0000 (22:36 +0000)]
Merge "Removes summary text from Instant Apps details"
Daniel Nishi [Wed, 29 Mar 2017 21:13:18 +0000 (21:13 +0000)]
Merge "Lower case the first letter of storage type."
Daniel Nishi [Wed, 29 Mar 2017 21:13:04 +0000 (21:13 +0000)]
Merge "Add a movies & tv apps category to storage settings."
Stephen Chen [Wed, 29 Mar 2017 21:08:55 +0000 (21:08 +0000)]
Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev am:
31170fb629
am:
180810d00c
Change-Id: I7a405f1abfe753ab70ac8e83829dc22a74a1c66b
Stephen Chen [Wed, 29 Mar 2017 21:06:55 +0000 (21:06 +0000)]
Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev
am:
31170fb629
Change-Id: Iee3dace687af34d3a1f75e9f201a38135c3f7997
TreeHugger Robot [Wed, 29 Mar 2017 21:00:55 +0000 (21:00 +0000)]
Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev
Peter Qiu [Tue, 14 Mar 2017 22:53:20 +0000 (15:53 -0700)]
wifi: managed Passpoint configurations in "Saved Networks" page
Instead of going through WifiTracker to retrieve saved network
configurations (including both WiFi networks and Passpoint provider
configurations), use the WifiManager's APIs to retrieve the
configurations directly, to avoid any unnecessary complexities.
Also update to use the appropriate APIs for configuration removal
based on the configuration type.
Bug:
34207710
Test: manual test by removing a Passpoint configuration from
"Saved Networks" page.
Change-Id: I549cc484d8825b6c38895428c1b7941390bb5f1f
jackqdyulei [Wed, 29 Mar 2017 00:50:04 +0000 (17:50 -0700)]
Update string for battery main page
Bug:
36576021
Test: Build
Change-Id: I60c43868dd54bfaf75648a9ac70a3ff5815180b6
(cherry picked from commit
630a8c054b7be4ac6b8baf32b5f85ff6844c4ddf)
TreeHugger Robot [Wed, 29 Mar 2017 20:52:07 +0000 (20:52 +0000)]
Merge "Update string for battery main page"
Doris Ling [Wed, 29 Mar 2017 20:37:01 +0000 (20:37 +0000)]
Merge "Only register conditions receiver when needed." into oc-dev am:
258e8a8117
am:
c5cc3ad8ab
Change-Id: Iee3b638cf04acd6fa6ea01ec5ec24e001e15141a
Doris Ling [Wed, 29 Mar 2017 20:36:48 +0000 (20:36 +0000)]
Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev am:
6fd47da7c3
am:
be2c0fc6a3
Change-Id: Idb1e8fea80a256da483afed6de777f567d80e098
Doris Ling [Wed, 29 Mar 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Only register conditions receiver when needed." into oc-dev
am:
258e8a8117
Change-Id: Ifc56d2c84f38c4c924596aff660e7c156166266e
Doris Ling [Wed, 29 Mar 2017 20:33:58 +0000 (20:33 +0000)]
Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev
am:
6fd47da7c3
Change-Id: I7e28a6691b6ceabe079aad87fde2389f07789dbc
Doris Ling [Wed, 29 Mar 2017 20:33:21 +0000 (20:33 +0000)]
Merge "Only register conditions receiver when needed." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 20:30:26 +0000 (20:30 +0000)]
Merge "Remove android:visibility attributes from Preferences"
TreeHugger Robot [Wed, 29 Mar 2017 20:26:10 +0000 (20:26 +0000)]
Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev
jackqdyulei [Mon, 27 Mar 2017 23:38:47 +0000 (16:38 -0700)]
Hide Wifi and Systemui in settings main page
Also move the systemui to category system
Fix:
36644740
Fix:
36645264
Test: RunSettingsRoboTests
Change-Id: I6b64a7dca58091f3a1d8b7d99c8bae7ddf9169f9
(cherry picked from commit
1e95b74f774b2b8b97b8f512451313696ed97c50)
jackqdyulei [Mon, 27 Mar 2017 21:00:29 +0000 (14:00 -0700)]
Add summary for categories in battery advanced page
If the category only contains one app, show usage time, otherwise
show app with maximum usage.
Also add usage time for apps in battery settings page.
Bug:
35396770
Test: RunSettingsRoboTests
Change-Id: I43fe9c2289535be2c1b95ffded6b52b0ff099589
(cherry picked from commit
3bbaca9c7c863c802f2897ac30daa2c59e2115c1)
jackqdyulei [Wed, 15 Mar 2017 22:13:10 +0000 (15:13 -0700)]
Create Controller for app buttons
These two buttons(uninstall + forcestop) are used in both battery page
and app page, we should move the logic for these two buttons into one
place.
This cl creates the AppButtonsPreferenceController for the above
purpose. This cl only copies the logic to controller but hasn't make
InstalledAppDetails use this controller.
Since DialogFragment could not use function in controller directly,
the controller expose DialogListener and all the fragments must
implement this interface. Then they can delegate the method call
to controller directly.
The following cl will:
1. Make the InstalledAppDetails be compatible to controller
2. Make the InstalledAppDetails use this controller.
Bug:
35810915
Test: RunSettingsRoboTests
Change-Id: Ie2aa8064bcec3003233896c18be772825b12930a
(cherry picked from commit
82d07983b46b4c6a1b7a3c431c57ff45e84e72be)
Lei Yu [Wed, 29 Mar 2017 20:18:21 +0000 (20:18 +0000)]
Merge "Add summary for categories in battery advanced page"
Christine Franks [Wed, 29 Mar 2017 18:35:57 +0000 (11:35 -0700)]
Disable default indicator for night display
Bug:
36695989
Test: make -j100, and manually verified that default indicator no
longer appears on the SeekBar.
Change-Id: I574938bc664f8b750a3fe9ab52f361f46ad1f327
OSDN Git Service
