OSDN Git Service
Maurice Lam [Thu, 8 Jun 2017 03:59:51 +0000 (20:59 -0700)]
Create new category for lock screen redaction
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug:
62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
TreeHugger Robot [Mon, 5 Jun 2017 22:13:50 +0000 (22:13 +0000)]
Merge "Move UsageGraph from SettingsLib to Settings."
TreeHugger Robot [Mon, 5 Jun 2017 22:11:40 +0000 (22:11 +0000)]
Merge "Bluetooth: Always scan while on pairing or DevicePicker page"
Maurice Lam [Mon, 5 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Show fingerprint text in backup screen lock"
Alex Kulesza [Fri, 2 Jun 2017 22:16:28 +0000 (18:16 -0400)]
Move UsageGraph from SettingsLib to Settings.
In preparation for modifying the graph code to show detailed projections
(see bug), this change moves it into Settings along with related tests
and resources.
Bug:
38400320
Test: manual, make SettingsUnitTests, make SettingsGoogleUnitTests
Change-Id: I88e5336c15827727b3427e29b10954bba9cfba7d
Jack He [Wed, 31 May 2017 06:05:46 +0000 (23:05 -0700)]
Bluetooth: Always scan while on pairing or DevicePicker page
* Modified DeviceListPreferenceFragment to have enable/disable scanning
methods. In ENABLE state, each onScanningStateChanged(false) will
restart another round of scanning
* Subclasses of DeviceListPreferenceFragment should call enable/disable
scanning when scanning is needed for long period of time
* Currently, BluetoothPairingDetail and DevicePickerFragment call
enableScanning() when Bluetooth is turned ON and call disableScanning
when some device is picked in their lists
* Both BluetoothPairingDetail and DevicePickerFragment will re-enable
scanning if pairing failed for selected device
* Added associated unit tests as well
Bug:
32172815
Test: make, pair Bluetooth device, send file over Bluetooth Opp
Change-Id: I99325e06aadd7b00e7a7ba6d6c282a6831859d8b
Fan Zhang [Sun, 4 Jun 2017 00:17:27 +0000 (17:17 -0700)]
Misc layout fixes
- Apply entity header effect to battery summary screen.
- BidiWrap wifi ap name is it's correctly displayed in RLT languages
- Remove footer preference layout - settingslib already has one
Fix:
62039146
Fix:
62138362
Fix:
37920219
Test: make RunSettingsRoboTests
Change-Id: Idf1385ee40772c63075e5f81eb039c6da56256ab
Maurice Lam [Thu, 1 Jun 2017 00:55:43 +0000 (17:55 -0700)]
Show fingerprint text in backup screen lock
When setting up fingerprint's backup screen lock, show a different
header text that says
"To use fingerprint, set {PIN/pattern/password}" instead of
"Choose your {PIN/pattern/password}".
Test: Manual. Existing tests pass
Bug:
62187833
Change-Id: If1084e64b99291a0eda63c174793b5a091ab4bae
Lei Yu [Mon, 5 Jun 2017 17:19:04 +0000 (17:19 +0000)]
Merge "Use new time format in BatteryInfo"
TreeHugger Robot [Sun, 4 Jun 2017 03:24:51 +0000 (03:24 +0000)]
Merge "Update suggestion rules and string description"
Fan Zhang [Sat, 3 Jun 2017 22:24:11 +0000 (15:24 -0700)]
Update suggestion rules and string description
Change-Id: I55025094b9a0e71710db726bcf7fc810a3705c65
Fix:
62262851
Fix:
62283797
Test: make RunSettingsRoboTests
Android Build Merger (Role) [Sun, 4 Jun 2017 00:10:35 +0000 (00:10 +0000)]
Merge "Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1 am:
6270dce2cd am:
7151be926d am:
ecc7355bde"
TreeHugger Robot [Sun, 4 Jun 2017 00:10:30 +0000 (00:10 +0000)]
Merge "Add a suggestion: showing new device features"
Thecrazyskull [Sun, 4 Jun 2017 00:10:11 +0000 (00:10 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1 am:
6270dce2cd am:
7151be926d
am:
ecc7355bde
Change-Id: Ic422ded3965a9f8bc3cafb7cbf0b1e4585142672
Thecrazyskull [Sun, 4 Jun 2017 00:04:25 +0000 (00:04 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1 am:
6270dce2cd
am:
7151be926d
Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
Thecrazyskull [Sun, 4 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1
am:
6270dce2cd
Change-Id: Ie8ce734935d9950c515675710772aa5f3c80c988
Thecrazyskull [Sat, 3 Jun 2017 23:55:52 +0000 (23:55 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
am:
46f7199cb1
Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
Treehugger Robot [Sat, 3 Jun 2017 23:49:37 +0000 (23:49 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
Mikhail Malakhov [Sat, 3 Jun 2017 22:31:29 +0000 (22:31 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a am:
933cdd5503 am:
0730393097
am:
38382a44b0
Change-Id: I845582c9c044cab4a2abfdf19ee6ca5f037de4cb
Mikhail Malakhov [Sat, 3 Jun 2017 22:24:50 +0000 (22:24 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a am:
933cdd5503
am:
0730393097
Change-Id: Ia65d7c966350dac44a1d15a5781d051df8d464cd
Mikhail Malakhov [Sat, 3 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a
am:
933cdd5503
Change-Id: I0fbdadf1b42543936f3ed657b52da23978a0fe16
Mikhail Malakhov [Sat, 3 Jun 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am:
c7697e9b8a
Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
Treehugger Robot [Sat, 3 Jun 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
Tony Mantler [Sat, 3 Jun 2017 22:05:21 +0000 (22:05 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev am:
685041559a
am:
ea71adb730 -s ours
Change-Id: Id876c24798a8f1a95e39915be3f6201ac0c9103a
Tony Mantler [Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
685041559a
Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
Fan Zhang [Thu, 1 Jun 2017 00:47:37 +0000 (17:47 -0700)]
Add a suggestion: showing new device features
- New suggestion activity
- Removed useless api SuggestionFeatureProvider.isPresent().
- Also updated support activity search indexing icon and summary
Change-Id: Ib52cf26a985f57bf0aac918606b10f75bd024639
Fix:
62034077
Fix:
62196070
Test: make RunSettingsRoboTests
TreeHugger Robot [Sat, 3 Jun 2017 21:40:51 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 18:49:53 +0000 (18:49 +0000)]
Merge "Combine settings suggestion and condition."
TreeHugger Robot [Sat, 3 Jun 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Move strings to SettingsLib so TV can use them"
Thecrazyskull [Thu, 2 Mar 2017 19:55:59 +0000 (14:55 -0500)]
ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
TreeHugger Robot [Fri, 2 Jun 2017 22:33:56 +0000 (22:33 +0000)]
Merge "String update for setup wizard"
jackqdyulei [Fri, 2 Jun 2017 20:15:12 +0000 (13:15 -0700)]
Use new time format in BatteryInfo
1. Using "h" and "m" instead of "hrs" and "min"
2. Refactor the string to CharSequence so it won't have
TTS issue(i.e read "m" as "meter")
3. Update tests related to this part.
Bug:
37201139
Test: RunSettingsRoboTests
Change-Id: I9cadb511572b2d522d26ab337c171fa69da87475
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
TreeHugger Robot [Fri, 2 Jun 2017 22:01:55 +0000 (22:01 +0000)]
Merge "Add strings to use in Bluetooth device forget confirmation"
Doris Ling [Thu, 11 May 2017 23:27:54 +0000 (16:27 -0700)]
Combine settings suggestion and condition.
- Add a flag in dashboard feature provider to specify whether to use the
combined UI for suggestions and conditions.
- Move Conditions below Suggestions.
- Add dashboard entity for condition and suggestion container, and
wrap the condition and suggestion list inside the container. The
container itself will be a single dashboard item, and within it will
be the list of suggestion or condition.
- Add suggestion/condition header that will show the combined info for
the conditions and suggestion data, and have the expand button to
control expanding both the suggestion and condition list.
- Change the individual condition card to be always expanded, and
remove the logic to collapse/expand individual condition card.
- Remove the divider between the action button and condition detail
within each condition card.
- Add suggestion/condition footer for collapsing the whole suggestion and
condition list.
Bug:
37645754
Test: make RunSettingsRoboTests
Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
TreeHugger Robot [Fri, 2 Jun 2017 20:49:26 +0000 (20:49 +0000)]
Merge "Updating the search ranking API and some improvements:"
Peter Qiu [Fri, 2 Jun 2017 20:45:36 +0000 (20:45 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev am:
7eeca4b052
am:
d8895787c9
Change-Id: I4a8f9ed8661f9af6105456c3a0d681373768dc40
Peter Qiu [Fri, 2 Jun 2017 20:38:58 +0000 (20:38 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
am:
7eeca4b052
Change-Id: I5a8daed2e821623aaa953ccf256808776f7febdd
TreeHugger Robot [Fri, 2 Jun 2017 20:25:12 +0000 (20:25 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
Lei Yu [Fri, 2 Jun 2017 19:32:08 +0000 (19:32 +0000)]
Merge "Restart loader in onResume" into oc-dev am:
74ca6aa060
am:
64c87589c5 -s ours
Change-Id: I8f00cfce679daa7e2e3e20589b21c109ab35f35c
Lei Yu [Fri, 2 Jun 2017 19:29:09 +0000 (19:29 +0000)]
Merge "Restart loader in onResume" into oc-dev
am:
74ca6aa060
Change-Id: I4cc76a8eeee55335bd6a4ab7d6870084ec609f9b
Lei Yu [Fri, 2 Jun 2017 19:21:27 +0000 (19:21 +0000)]
Merge "Restart loader in onResume" into oc-dev
Soroosh Mariooryad [Thu, 20 Apr 2017 21:20:05 +0000 (14:20 -0700)]
Updating the search ranking API and some improvements:
- Ranking API is modified to run the ranking asynchronous to the main thread.
Therefore, it can now run in parallel to loading the results from DB
which decreases the overall latency.
- Ranking API now supports reporting failure from the ranker
implementation side.
- Settings that are not ranked by the ranker algorithm are now ranked at
the end of the list. This is added for dynamic settings (e.g., apps).
- Failure handling mechanism is added for cases that ranker catches an
exception or it takes a long time to respond.
Bug:
37312700
Fixes:
36866337
Fixes:
36867476
Fixes:
36866736
Fixes:
36866838
Test: RunSettingsRoboTests
Change-Id: I3a2a97e3a07a8d4afbb090061d92172a27588ee7
Alison Cichowlas [Fri, 2 Jun 2017 18:52:33 +0000 (18:52 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev am:
e811873b4e
am:
f62c6372e8
Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948
Suprabh Shukla [Fri, 2 Jun 2017 18:51:09 +0000 (18:51 +0000)]
Merge "Always returning the updated preference summary"
Alison Cichowlas [Fri, 2 Jun 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
am:
e811873b4e
Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
TreeHugger Robot [Fri, 2 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 18:06:47 +0000 (18:06 +0000)]
Merge "Simplify InlineSwitchPayloads and generalize get/set method"
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug:
62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
Peter Qiu [Wed, 31 May 2017 17:19:42 +0000 (10:19 -0700)]
wifi: use WifiSavedConfigUtils to retrieve saved configurations
Bug:
62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
Lei Yu [Fri, 2 Jun 2017 17:16:53 +0000 (17:16 +0000)]
Merge "Refine the ProgressCategory" into oc-dev am:
5f4f1b81af
am:
f2379e2ed3
Change-Id: Ibc809ffa4740e9f4a51975c4cdc94b5ff3f4643a
Lei Yu [Fri, 2 Jun 2017 17:13:55 +0000 (17:13 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
am:
5f4f1b81af
Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
Lei Yu [Fri, 2 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 17:02:30 +0000 (17:02 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev am:
3efc502840
am:
5698552021
Change-Id: Ib0a9db86ea0191c4cd487842eb9ce49b9e6db2e0
Alison Cichowlas [Fri, 2 Jun 2017 16:56:59 +0000 (16:56 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
am:
3efc502840
Change-Id: Ib9006beaec685ef91583278585c9522f995d3c09
TreeHugger Robot [Fri, 2 Jun 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev am:
4b29f593f0
am:
b143e15dd1 -s ours
Change-Id: I74811fefac1d831c4f851bfa783b1e0aee20f41a
Alison Cichowlas [Fri, 2 Jun 2017 15:48:25 +0000 (15:48 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
am:
4b29f593f0
Change-Id: Ia4c0c9a506894033471b563f89e02a35cbf25601
Alison Cichowlas [Fri, 2 Jun 2017 15:39:44 +0000 (15:39 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
Matthew Fritze [Tue, 23 May 2017 16:42:33 +0000 (09:42 -0700)]
Simplify InlineSwitchPayloads and generalize get/set method
InlineSwitchPayload now assumes that all switches will be
stored as 1 or 0, which simplifies the code.
Moves Availability into ResultPayload, so that custom
payloads can be created to set/get values which are more
complicated than stotring ints (like bluetooth or DnD),
and give more expressive reasons when unavailable.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: I87e6fc041bfd398e7daf6e6e479d502930d36f0f
Bartosz Fabianowski [Fri, 2 Jun 2017 13:34:12 +0000 (13:34 +0000)]
Hide "Changes made by your organization's admin" when empty am:
493495452a
am:
98b216dc05 -s ours
Change-Id: Icd55cf9ce8a18578be783d057bd92a8ebdf639e0
Bartosz Fabianowski [Fri, 2 Jun 2017 13:30:12 +0000 (13:30 +0000)]
Hide "Changes made by your organization's admin" when empty
am:
493495452a
Change-Id: Ided6278456fe5ffdbb843717a1ec7070e7a3d3dc
Bartosz Fabianowski [Thu, 18 May 2017 09:46:38 +0000 (11:46 +0200)]
Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug:
35912953
Test: m RunSettingsRoboTests
Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
Bartosz Fabianowski [Fri, 2 Jun 2017 08:43:11 +0000 (10:43 +0200)]
Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug:
35912953
Test: m RunSettingsRoboTests
Change-Id: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Esteban Talavera [Fri, 2 Jun 2017 08:42:50 +0000 (08:42 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev am:
92f78354f9
am:
42d97f86c2
Change-Id: If2708bc27673b50dfdf7faa3300944d8bdb47b60
Esteban Talavera [Fri, 2 Jun 2017 08:38:51 +0000 (08:38 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
am:
92f78354f9
Change-Id: I3dc5fd6bb4c7466b204946db179b10d9a3c9ccdf
Esteban Talavera [Fri, 2 Jun 2017 08:33:16 +0000 (08:33 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
Lorenzo Colitti [Fri, 2 Jun 2017 06:27:13 +0000 (06:27 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev am:
0187221bd8
am:
cc347f4e14
Change-Id: Idf82b916ae8121b837b7113af7ab182640124814
Lorenzo Colitti [Fri, 2 Jun 2017 06:18:13 +0000 (06:18 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
am:
0187221bd8
Change-Id: I7873b3f06b40e416b89b44615e9fe28a5b3c7a29
TreeHugger Robot [Fri, 2 Jun 2017 06:11:51 +0000 (06:11 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
* changes:
Reduce jank in the wifi detail status page.
Improve testing of IP address display code.
Sheng Wang [Fri, 2 Jun 2017 04:32:10 +0000 (04:32 +0000)]
Volume can not be updated in Sound¬ification am:
8c329af634
am:
d453911e27
Change-Id: I2bfd519b3d52f6e699d2d9a3be4753381821ce25
Sheng Wang [Fri, 2 Jun 2017 04:29:05 +0000 (04:29 +0000)]
Volume can not be updated in Sound¬ification
am:
8c329af634
Change-Id: I8031a9bbe82b40e79698e9d6be75bcd85bcde028
TreeHugger Robot [Fri, 2 Jun 2017 02:48:22 +0000 (02:48 +0000)]
Merge "Make BatterySettings Asynchronous and use enhanced estimate"
TreeHugger Robot [Fri, 2 Jun 2017 02:39:30 +0000 (02:39 +0000)]
Merge "Update string for recent apps."
TreeHugger Robot [Fri, 2 Jun 2017 01:18:20 +0000 (01:18 +0000)]
Merge "Check for null mReadOnlyApnTypes."
Salvador Martinez [Tue, 30 May 2017 18:18:09 +0000 (11:18 -0700)]
Make BatterySettings Asynchronous and use enhanced estimate
this CL changes BatteryInfo methods to all use the async style
callback approach it had for one of the methods. Non-async methods
are now annotated to only be used in worker threads. BatteryInfo
can now be obtained via callback by calling one of the async
methods. Alternatively if there is a worker thread available
the synchronous methods similar to the old ones can be used.
The callback methods have all been changed so that they cascade to a
async method that takes all the required info as paremeters. This
will minimize the amount of churn in files that currently use
BatteryInfo.
A new loader was created that can be used to get BatteryInfo in
places that wish to get it. This loader is used in
PowerUsageSummary to get the BatteryInfo.
Test: Robotests
Bug:
38399275
Bug:
38398949
Bug:
38399654
Change-Id: Ic5a82d8ca4c85fad1b883226327ec083badf861d
Doris Ling [Fri, 2 Jun 2017 00:22:37 +0000 (17:22 -0700)]
Update string for recent apps.
Bug:
62273254
Test: builds
Change-Id: I57a06b4bdfaa9c41636baeddcb94c71bf4518ebc
Sheng Wang [Fri, 2 Jun 2017 00:57:09 +0000 (00:57 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1 am:
9dbd34a3d9
am:
61a420df95
Change-Id: I0ed31e1c4e8b1a74a2aca2288876ca57f05ca79c
TreeHugger Robot [Fri, 2 Jun 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Don't index High usage summary"
TreeHugger Robot [Fri, 2 Jun 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Restart loader in onResume"
Sheng Wang [Fri, 2 Jun 2017 00:27:56 +0000 (00:27 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1
am:
9dbd34a3d9
Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
Sheng Wang [Fri, 2 Jun 2017 00:25:17 +0000 (00:25 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185
am:
161e3d14e1
Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
TreeHugger Robot [Thu, 1 Jun 2017 23:38:42 +0000 (23:38 +0000)]
Merge "Add strings in battery usage page"
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
Volume can not be updated in Sound¬ification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug:
37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
Suprabh Shukla [Thu, 1 Jun 2017 21:54:38 +0000 (14:54 -0700)]
Always returning the updated preference summary
AppEntry is not being updated when opening nested app info activities,
which led to stale preference summary being returned for external
sources details.
Test: Manually checked the preference summary is correctly reflecting
the state of the switch.
Existing test ExternalSourcesSettingsTest passes.
Bug:
37487637
Change-Id: Id3c665c7cc7231023f4110725b3b15e43284de97
TreeHugger Robot [Thu, 1 Jun 2017 22:57:25 +0000 (22:57 +0000)]
Merge "Add group name into channel summary, if applicable."
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug:
62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Antony Sargent [Thu, 1 Jun 2017 20:59:28 +0000 (13:59 -0700)]
Add strings to use in Bluetooth device forget confirmation
We're going to add a confirmation dialog for when the user chooses to
unpair with (or "forget") a Bluetooth device on the device details
page. These are the strings we'll use in the dialog.
Bug:
37955181
Bug:
35876580
Test: (should be covered by existing tests)
Change-Id: Iec08fcc2730129c0e9a8f54cc94ab8aad958f353
jackqdyulei [Thu, 1 Jun 2017 22:46:21 +0000 (15:46 -0700)]
Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center
Bug:
37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
TreeHugger Robot [Thu, 1 Jun 2017 22:46:11 +0000 (22:46 +0000)]
Merge "Update strings for anomaly detection"
Andrew Sapperstein [Thu, 1 Jun 2017 22:28:08 +0000 (22:28 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev am:
fbc9035bcd
am:
0a35757003 -s ours
Change-Id: Icad5a856745ddafc5f79aecd81eceed46aeabb29
Andrew Sapperstein [Thu, 1 Jun 2017 22:17:44 +0000 (22:17 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
am:
fbc9035bcd
Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
TreeHugger Robot [Thu, 1 Jun 2017 22:02:31 +0000 (22:02 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 21:41:38 +0000 (21:41 +0000)]
Merge "Hide saved network preference when there is none."
Mikhail Malakhov [Thu, 20 Oct 2016 19:45:18 +0000 (22:45 +0300)]
Sometime, Settings app crash when AllowBindAppWidgetActivity closing
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@
5817135
Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com>
jackqdyulei [Thu, 1 Jun 2017 21:33:19 +0000 (14:33 -0700)]
Add strings in battery usage page
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time
Bug:
37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27