OSDN Git Service
Bill Yi [Tue, 6 Jun 2017 16:34:19 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
11465af11e -s ours
am:
d650629364 -s ours
Change-Id: I9a4dd50058845bfb7db289ebeda520b4267aa828
Bill Yi [Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
11465af11e -s ours
Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821
TreeHugger Robot [Tue, 6 Jun 2017 16:17:42 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 15:16:05 +0000 (15:16 +0000)]
Merge "String changes"
Salvador Martinez [Tue, 6 Jun 2017 15:04:52 +0000 (15:04 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev am:
a8e887be86
am:
4eb906a672
Change-Id: I48ee59ed5c626496de4bda51f26e25647c3cc16d
jackqdyulei [Tue, 6 Jun 2017 15:04:09 +0000 (15:04 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev am:
8fbb0bc1f2
am:
0686f63083 -s ours
Change-Id: I0877907fbfc1b8dd43d18d381ee5115150466ca8
Lorenzo Colitti [Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)]
Merge changes I23540440,I67269e1a into oc-dev am:
4249a7092b
am:
844c385c09
Change-Id: I258837998e0c242d4c4dd4fb7c69da8049837173
Yohann Roussel [Tue, 6 Jun 2017 10:01:43 +0000 (12:01 +0200)]
resolve merge conflicts of
1104b94dbc to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea
TreeHugger Robot [Tue, 6 Jun 2017 06:33:48 +0000 (06:33 +0000)]
Merge "Ensure wifi ssid cannot exceed 32 bytes."
TreeHugger Robot [Tue, 6 Jun 2017 06:20:47 +0000 (06:20 +0000)]
Merge "Add help url placeholders for new pages"
Salvador Martinez [Tue, 6 Jun 2017 04:35:19 +0000 (04:35 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
am:
a8e887be86
Change-Id: I561cd90ba74a551a44d43a04a1b567efc74e4863
Salvador Martinez [Tue, 6 Jun 2017 04:29:31 +0000 (04:29 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Bug:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Fix:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
jackqdyulei [Tue, 6 Jun 2017 02:05:09 +0000 (02:05 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
am:
8fbb0bc1f2
Change-Id: Idd493f97773816dc4cc1c759bc5465a2b7f4b04f
TreeHugger Robot [Tue, 6 Jun 2017 02:04:22 +0000 (02:04 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 6 Jun 2017 01:58:16 +0000 (01:58 +0000)]
Merge "Add ability to see both battery estimates on long press"
TreeHugger Robot [Tue, 6 Jun 2017 01:53:58 +0000 (01:53 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 01:28:52 +0000 (01:28 +0000)]
Merge "Add a new Bluetooth device details page"
Lorenzo Colitti [Tue, 6 Jun 2017 01:27:32 +0000 (01:27 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
am:
4249a7092b
Change-Id: Ic8383cce733c5767b133af0e9f85e213e0c36018
Doris Ling [Tue, 6 Jun 2017 01:24:38 +0000 (01:24 +0000)]
Remove call to WifiManager.setWifiApEnabled(). am:
f38ed2fbb2
am:
802db8a844
Change-Id: If6e76b06e014d2c3e3eadf60c4bc2ff8e6a50607
Lorenzo Colitti [Tue, 6 Jun 2017 01:22:07 +0000 (01:22 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
* changes:
When validation state changes, update the AP summary.
Minor tweaks to WifiDetailPreferenceControllerTest.
Doris Ling [Tue, 6 Jun 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
am:
051a83d909
Change-Id: I4ba1750948815233ef6a963ddde1ca0bd33bcdec
Doris Ling [Tue, 6 Jun 2017 01:15:10 +0000 (01:15 +0000)]
Remove call to WifiManager.setWifiApEnabled().
am:
f38ed2fbb2
Change-Id: I255679d0eaeaa94d2ac6e5caddf4c6f5a5581bc1
TreeHugger Robot [Tue, 6 Jun 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 00:01:28 +0000 (00:01 +0000)]
Merge "Update support strings in Settings"
Doris Ling [Mon, 5 Jun 2017 21:48:44 +0000 (14:48 -0700)]
Also update flip camera settings for managed profile.
When user update the setting for flip camera, check if there is managed
profile for the user, and update the setting for the managed user id as
well, so that the work profile camera app can read the correct setting
value.
Change-Id: I757041289329870311bc8473b19fd49ecdd0fadb
Fix:
62078588
Test: make RunSettingsRoboTests
Salvador Martinez [Tue, 23 May 2017 00:26:39 +0000 (17:26 -0700)]
Add ability to see both battery estimates on long press
If the enhanced estimate is being used in battery settings
it is now possible to long press on the text to have it display
both instead of the string that is normally used.
Adds another loader to enable this since it needs both the old
and the new estimates simultaneously.
Feature is hidden behind a feature flag that only googlers will
have enabled.
Test: robotests
Bug:
38399275
Change-Id: I5caf26513baada27efd50ddb0e72d3868da47150
Fan Zhang [Mon, 5 Jun 2017 22:50:00 +0000 (15:50 -0700)]
Ensure wifi ssid cannot exceed 32 bytes.
Change-Id: I5c2c50ca8599f6843da47c01b9a0447e2c85d763
Fix:
36898746
Test: make RunSettingsRoboTests
Doris Ling [Fri, 2 Jun 2017 00:06:40 +0000 (17:06 -0700)]
Remove call to WifiManager.setWifiApEnabled().
- replace it with ConnectivityManager.stopTethering() instead.
Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix:
62191978
Test: make RunSettingsRoboTests
Salvador Martinez [Mon, 5 Jun 2017 22:17:20 +0000 (15:17 -0700)]
Update support strings in Settings
String change CL for support strings in settings.
Test: image attached, robotests still pass
Bug:
62145221
Change-Id: Ib10998374be961e42ab6994a7b32e521c49c4652
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"
Fan Zhang [Mon, 5 Jun 2017 20:13:42 +0000 (13:13 -0700)]
Add help url placeholders for new pages
Bug:
38412798
Test: visual
Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
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
Antony Sargent [Thu, 4 May 2017 22:06:32 +0000 (15:06 -0700)]
Add a new Bluetooth device details page
Bug:
35877479
Test: make RunSettingsRoboTests
The existing behavior is to bring up a dialog with Bluetooth device
details with checkboxes for each supported profile. This adds a new page
that serves the same purpose with a switch for each profile and a footer
containing the MAC address.
Whether to use the new page or old dialog is controlled by a flag
accessible via BluetoothFeatureProvider.
Change-Id: I026c363d4cd33932a84017a67cbef51c258bad10
jackqdyulei [Mon, 5 Jun 2017 17:44:34 +0000 (10:44 -0700)]
Make footer preferences non-clickable by default
cherry-picked from ag/
2301717
Both the footer preference and the TextView they contain
were clickable, which confused some accessibility services.
Bug:
62050563
Test: Verified that switch access no longer offers users
the option of clicking on the footer for accessibility
services and Magnification as well as in the Battery
settings screen.
Change-Id: I5cb13d6268466c690dd38f2b652422d2c3d813b4
Merged-In: I937340fda93f6a8097919e1f86d5d890487370bc
Lei Yu [Mon, 5 Jun 2017 17:19:04 +0000 (17:19 +0000)]
Merge "Use new time format in BatteryInfo"
Julia Reynolds [Mon, 5 Jun 2017 13:06:31 +0000 (09:06 -0400)]
String changes
- channel summaries
- Notification listener name
- notifications app page title
Change-Id: I0745c06aad44bfa7636ee2b10be9387313093fe3
Fixes:
36529184
Fixes:
38178073
Test: manual
Lorenzo Colitti [Fri, 2 Jun 2017 09:00:40 +0000 (18:00 +0900)]
When validation state changes, update the AP summary.
This stops the AP summary from getting stuck on "Connected, no
Internet" even when the system has validated Internet access.
Bug:
62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I235404408f7d8b958653d25656d97da8206e35ce
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."
Bill Yi [Sat, 3 Jun 2017 18:42:52 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 18:04:01 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a1b048bab26b99a535ccdb42ab21002935a5fa0
Auto-generated-cl: translation import
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