OSDN Git Service
Doris Ling [Sat, 1 Apr 2017 02:08:25 +0000 (02:08 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev
am:
23accd2179
Change-Id: Ia48fba32cdbd027ffe052016b0d8d3f3ee250993
TreeHugger Robot [Sat, 1 Apr 2017 02:03:26 +0000 (02:03 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev
Stephen Chen [Sat, 1 Apr 2017 01:28:51 +0000 (01:28 +0000)]
Improve responsiveness of toggling wifi and refactor user restriction logic.
am:
19b74d9213
Change-Id: I0d776b5e4325782b9c6ad05beae51ca7e902fd22
Stephen Chen [Fri, 31 Mar 2017 21:42:20 +0000 (14:42 -0700)]
Improve responsiveness of toggling wifi and refactor user restriction logic.
Moved logic for handling wifi state changes into correct listener
method. Changed logic for handling isUiRestricted. This should
streamline toggling flow for WiFi both when Wifi Scanning is on and off,
and in guest mode.
Bug:
36724409
Bug:
36711085
Bug:
36398321
Test: make, test cases in tracking bug
Change-Id: I69fe07369db192c94f81dd678087ac4e8c35197b
Doris Ling [Fri, 31 Mar 2017 18:09:07 +0000 (11:09 -0700)]
Update text for USB mode selection dialog.
- create separate strings to be used for the USB preference summary.
- reverted the previous changes made to change the verb in the usb
preference title.
- updated the summary text for the usb selection description for charge
only.
Bug:
36234108
Test: builds
Change-Id: I4a57ecd6f9be4b3c10885ac1bbba76ff3df02b84
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
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: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: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: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: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:23:46 +0000 (18:23 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
am:
0df5281fe6
Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
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: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: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: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
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
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
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 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: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: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
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: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 [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
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: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()"
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)
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: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)
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
Stephen Chen [Tue, 28 Mar 2017 21:14:35 +0000 (14:14 -0700)]
Connect immediately after pressing on previously connected saved networks.
Bug:
34287193
Test: manual inspection
Change-Id: Idf7156fa48640a34ce11cbf2f9683cfc6525a7b5
Julia Reynolds [Wed, 29 Mar 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev
am:
a48cb8d978
Change-Id: I0dc6f1393423509cf7c679395f621828c7948b5f
TreeHugger Robot [Wed, 29 Mar 2017 18:19:03 +0000 (18:19 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev
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
Doris Ling [Tue, 28 Mar 2017 23:02:04 +0000 (16:02 -0700)]
Only register conditions receiver when needed.
1. Update the dnd receiver to listen when dashboard summary running.
- remove the dnd receiver from Android manifest, and create it inside
the dnd condition.
- add lifecycle implementation to condition manager, so that the dnd
condition can know when to register and unregister the receiver.
- remove getReceiverClass() from dnd condition so that its receiver will
not be disabled by the default condition handling when condition is
silenced.
2. Remove all other conditions receiver from Android manifest.
- the broadcast receivers for HotspotCondition, AirplaneModeCondition,
CellularDataCondition from the manifest and create them inside the
condition classes.
- update Condition.onSilenceChanged() to register/unregister the
receivers instead of enable/disable the receiver class.
Change-Id: Iea6288382680df2b02884d1934b8db85daae404c
Fix:
35968517
Test: make RunSettingsRoboTests
Maurice Lam [Wed, 29 Mar 2017 16:48:02 +0000 (16:48 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev
am:
1ecbb7d16d
Change-Id: I90b936ea2ee30f35e636b9d7aa50d5e641ca9374
Maurice Lam [Wed, 29 Mar 2017 15:45:21 +0000 (15:45 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev
Julia Reynolds [Wed, 29 Mar 2017 14:41:22 +0000 (10:41 -0400)]
Don't run postexecute if activity is gone.
Change-Id: I9133a4d9e4e0fd2a92cc4df786e0bc5407d981fe
Fixes:
36551766
Test: monkey tests
Robin Lee [Wed, 29 Mar 2017 12:54:02 +0000 (13:54 +0100)]
resolve merge conflicts of
86c72f7ea5 to oc-dev-plus-aosp
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
Robin Lee [Wed, 29 Mar 2017 12:37:05 +0000 (12:37 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage" am:
ec6da66728
am:
9fff988f4a
Change-Id: I7f6570192ff654203c835cc23c46139bf10e178e
Robin Lee [Wed, 29 Mar 2017 12:34:39 +0000 (12:34 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
am:
ec6da66728
Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
Robin Lee [Wed, 29 Mar 2017 12:29:35 +0000 (12:29 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
Doris Ling [Mon, 27 Mar 2017 23:14:01 +0000 (16:14 -0700)]
Increase the char limit for the bluetooth tethering strings.
Longer summary text for the bluetooth tethering should be supported for
translation to other languages.
Bug:
36626585
Bug:
36627493
Bug:
36635108
Test: builds
Change-Id: Ia1409520443fd05c54a6c28fc292dd39b1c198b2
(cherry picked from commit
6d17af4d642302c8947f088c7336db8c5e6f2061)
Maurice Lam [Tue, 28 Mar 2017 23:27:03 +0000 (16:27 -0700)]
Revert choose lock header file to non-setup theme
The activity ChooseLockGeneric which inflates the layout file
choose_lock_generic_fingerprint_header is not setup themed, and
therefore should not use setup resources.
Test: Run ChooseLockGenericTest via `am instrument`
Bug:
36688431
Change-Id: I7286958345d1762d4a93176afe300d1e4d168f6d
Stephen Chen [Wed, 29 Mar 2017 02:24:27 +0000 (02:24 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
am:
d40ea0a963
Change-Id: Ie2b6385a47b7f6064e453ae09a5155d0ed16329f
TreeHugger Robot [Wed, 29 Mar 2017 02:20:09 +0000 (02:20 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
Stephen Chen [Wed, 29 Mar 2017 00:20:41 +0000 (17:20 -0700)]
Do not disable toggle when Wi-Fi is enabling and disabling.
The toggle disabling of Wi-Fi in its ENABLING and DISABLING states
are not in sync with the loading of access points, and so removed
the disabling entirely.
Bug:
34287227
Test: manual inspection.
Change-Id: Ibcb401eaaa34be79e1e73a947b2ea845cca79996
Yohei Yukawa [Tue, 28 Mar 2017 23:27:45 +0000 (23:27 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev
am:
ef34273654
Change-Id: Id4334fbb8911a7d826c547004773e03ef90f69d1
TreeHugger Robot [Tue, 28 Mar 2017 23:21:00 +0000 (23:21 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev
Amin Shaikh [Tue, 28 Mar 2017 20:43:36 +0000 (20:43 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev
am:
0f1d2bb81c
Change-Id: Ic5da1d4a885a827cc01e19e14ebe07f5b9408044
TreeHugger Robot [Tue, 28 Mar 2017 20:38:24 +0000 (20:38 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev
Doris Ling [Tue, 28 Mar 2017 20:14:03 +0000 (20:14 +0000)]
Revert "Convert BT preference to use TwoTargetPreference"
am:
457c3cbec2
Change-Id: I7c2bae70c0ec5d94dcf962ab98159ace751b7571
Doris Ling [Tue, 28 Mar 2017 19:53:31 +0000 (19:53 +0000)]
Revert "Convert BT preference to use TwoTargetPreference"
This reverts commit
09c7f15b121a531b17e39ba1dd3f54ae42472e3d.
Change-Id: I29aa67f026c0b54da08b19657f9916275e5a3459
Amin Shaikh [Tue, 28 Mar 2017 18:41:32 +0000 (11:41 -0700)]
Remove delayed processing of UI events in onStop
Bug:
36682492
Test: manually; test tracking in b/
36403635
Change-Id: Ia369cd61a6473ae2af4891cf6b923900504921c1
Doris Ling [Tue, 28 Mar 2017 18:49:44 +0000 (18:49 +0000)]
Add null check for the media player when surface texture is available.
am:
6709b6d399
Change-Id: Ia22b9ea654ff19a7dbe36e6da6c285e542d3c151
Doris Ling [Tue, 28 Mar 2017 18:14:34 +0000 (11:14 -0700)]
Add null check for the media player when surface texture is available.
- Call to MediaPlayer.create() method can return null, and hence we need
to check the return value before trying access the media player.
Change-Id: I4a5e0edbd6db21b678efb05ea733187f34185432
Fix:
36668356
Test: make RunSettingsRoboTests
Amin Shaikh [Tue, 28 Mar 2017 16:46:51 +0000 (16:46 +0000)]
Use Collator to sort saved networks.
am:
32924e2f58
Change-Id: I4a512a3e1424977d6f1085eb4a62f2ece19b61b7
Yohei Yukawa [Tue, 21 Mar 2017 23:47:20 +0000 (16:47 -0700)]
Set flagForceAscii for device password entries
Since the beginning [1], ChooseLockPassword#validatePassword() has never
accepted non-ASCII characters [2]. Hence we can safely specify
EditorInfo#IME_FLAG_FORCE_ASCII so that IMEs can optimize their UX based
on this flag. Note that EditorInfo#IME_FLAG_FORCE_ASCII is just a hint
for the IME so there should be no behavior change in the system side.
Note also that EditorInfo#IME_FLAG_FORCE_ASCII has been used in KeyGuard
(keyguard_password_view.xml) since JB MR-1 [3] so this flag is considered
to be well tested.
[1]:
00d2476d8fc122b4eef59d6be6f7aa41e9c56fde
[2]: Only character c where 32 <= c <= 126 is accepted
[3]: Id75286113771ca1407e9db182172b580f870b612
Test: Run `adb shell dumpsys input_method` when the password entry
field is focused to make sure that 'imeOptions' parameter
has 0x80000000 bit. Tested the following scenarios:
- PIN on a direct-boot disabled device
- PIN on a direct-boot enabled device
- Password on a direct-boot disabled device
- Password on a direct-boot enabled device
Fixes:
27858858
Change-Id: I3075e24c6dac4d49f4d0e56a0d4d8434a323754d
Amin Shaikh [Tue, 28 Mar 2017 01:07:46 +0000 (18:07 -0700)]
Use Collator to sort saved networks.
Bug:
36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
(cherry picked from commit
0c0fc19aef603470fc42ca33771e57c3656510eb)