OSDN Git Service
Fan Zhang [Thu, 4 May 2017 19:45:35 +0000 (12:45 -0700)]
Force refresh language & input fragment title onResume.
Fix:
37930106
Test: manual
It's necessary to refresh title because this page user can
change locale from here and fragment won't relaunch. Once
language changes, title must display in the new language.
Change-Id: I5fcaf36fd43e7f4fbbfddf3a77ffbcb9881470e3
Daniel Nishi [Thu, 4 May 2017 17:38:31 +0000 (17:38 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev am:
408fd90102
am:
7d50d9db12
Change-Id: Ie9e9b3978e7a2f52fdd63e203a740068188dc285
Esteban Talavera [Thu, 4 May 2017 17:38:00 +0000 (17:38 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev am:
607b4d0573
am:
895796aeb4
Change-Id: I48c4c71458ada35e5158350cddbc4641be8d018b
Daniel Nishi [Thu, 4 May 2017 17:30:41 +0000 (17:30 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
am:
408fd90102
Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
Esteban Talavera [Thu, 4 May 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
am:
607b4d0573
Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
Daniel Nishi [Thu, 4 May 2017 17:18:35 +0000 (17:18 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
Lei Yu [Thu, 4 May 2017 16:56:18 +0000 (16:56 +0000)]
Merge "Add icon in PowerUsageAnomalyDetails"
Fan Zhang [Thu, 4 May 2017 16:20:46 +0000 (16:20 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev am:
e4eb65c00e
am:
d8b6244d82
Change-Id: I0ea1c236ee55c1bb784a39bc8a4990d47616397b
Fan Zhang [Thu, 4 May 2017 16:17:46 +0000 (16:17 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
am:
e4eb65c00e
Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
Fan Zhang [Thu, 4 May 2017 16:12:25 +0000 (16:12 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
Esteban Talavera [Wed, 5 Apr 2017 15:31:10 +0000 (16:31 +0100)]
Show when work profile notifications are blocked for listener
Bug:
36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit
ee349792dd4d34bbbdc10446c88ce5f370d5347c)
Fan Zhang [Thu, 4 May 2017 02:30:53 +0000 (02:30 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev am:
efed517a8a
am:
7ab82146c1
Change-Id: I9edaf67a24c6486a6aa82c7fcbda9fced1addcdc
Fan Zhang [Thu, 4 May 2017 02:28:22 +0000 (02:28 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
am:
efed517a8a
Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f
TreeHugger Robot [Thu, 4 May 2017 02:23:17 +0000 (02:23 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
Lorenzo Colitti [Thu, 4 May 2017 02:15:09 +0000 (02:15 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev am:
33b0104cfc
am:
fdd0f1e141
Change-Id: I528df44eb284ca162ba5daf937aa8a020d65bc4c
Lorenzo Colitti [Thu, 4 May 2017 02:12:20 +0000 (02:12 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
am:
33b0104cfc
Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a
Lorenzo Colitti [Thu, 4 May 2017 02:06:48 +0000 (02:06 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
Android Build Merger (Role) [Thu, 4 May 2017 01:28:50 +0000 (01:28 +0000)]
Merge "Merge "Update "Phone idle" subtext" into oc-dev am:
3a1d6db0e7 am:
85950d5ebd"
jackqdyulei [Thu, 4 May 2017 01:28:37 +0000 (01:28 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev am:
3a1d6db0e7
am:
85950d5ebd
Change-Id: I0d3d67b274242f72fa46c157c7cee883a476a2e2
Android Build Merger (Role) [Thu, 4 May 2017 01:28:28 +0000 (01:28 +0000)]
Merge "Merge "Fix null pointer exception in wifi settings" into oc-dev am:
eb6eb99a56 am:
11853a75e3"
TreeHugger Robot [Thu, 4 May 2017 01:28:19 +0000 (01:28 +0000)]
Merge "Add anomaly icon for PowerGaugePreference"
Glen Kuhne [Thu, 4 May 2017 01:28:07 +0000 (01:28 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev am:
eb6eb99a56
am:
11853a75e3
Change-Id: I220e8f46313c3ede6a183c6485002f3b9e921df5
jackqdyulei [Thu, 4 May 2017 01:16:08 +0000 (01:16 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev
am:
3a1d6db0e7
Change-Id: I2c9b8a4c1d80911467d51ee883fb0a9a8bd01b43
Glen Kuhne [Thu, 4 May 2017 01:15:47 +0000 (01:15 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev
am:
eb6eb99a56
Change-Id: Id7fa8980306e02e5b441278b76f01d9343119ecf
TreeHugger Robot [Thu, 4 May 2017 01:11:23 +0000 (01:11 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:04:49 +0000 (01:04 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 00:55:26 +0000 (00:55 +0000)]
Merge "Update ConvertToFbe fragment to use InstrumentedFragment"
TreeHugger Robot [Thu, 4 May 2017 00:42:22 +0000 (00:42 +0000)]
Merge "Add icon for anomaly preference"
Daniel Nishi [Wed, 3 May 2017 21:14:56 +0000 (14:14 -0700)]
Fix a bug where override filter was always on.
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes:
37952170
Test: Settings unit test
Fan Zhang [Thu, 4 May 2017 00:03:55 +0000 (17:03 -0700)]
Fix string where it says "phone" on a tablet.
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix:
37833383
Test: visual
jackqdyulei [Tue, 2 May 2017 20:12:45 +0000 (13:12 -0700)]
Add icon in PowerUsageAnomalyDetails
Also add icon size in AnomalyPreference so it won't be too large.
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I124e99eba295d6600ffc73c05f73dd3c5c9de158
Jeremy Joslin [Wed, 3 May 2017 23:13:42 +0000 (23:13 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev am:
b8eb78b321
am:
91dd31d722
Change-Id: I800795ed106e38feba9682c6d1f5ae8179c87a11
Jeremy Joslin [Wed, 3 May 2017 23:05:59 +0000 (23:05 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
am:
b8eb78b321
Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
jackqdyulei [Mon, 1 May 2017 20:03:49 +0000 (13:03 -0700)]
Add anomaly icon for PowerGaugePreference
When the app contains anomaly, we should show anomaly icon(triangle
alert).
This cl also extracts a new method refreshAppListGroup from refreshUi.
New method is used to only refresh appListGroup. Reason for this action:
1. Improve performance(partial refresh)
2. We init AnomalyLoader in refreshUi, invoke refreshUi in
onLoadFinish will create infinite loop.
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: If54c89349e21763ca714123ac6ae884bd0f6a377
jackqdyulei [Wed, 26 Apr 2017 19:57:06 +0000 (12:57 -0700)]
Add icon for anomaly preference
Bug:
36924669
Test: Screenshot
Change-Id: Ie0925504a36ec3778e793c1f2d9bc00f1163cf34
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
Fan Zhang [Wed, 3 May 2017 22:49:11 +0000 (15:49 -0700)]
Update ConvertToFbe fragment to use InstrumentedFragment
It doesn't need to use SettingsPrefFragment.
Change-Id: I3f99fdc15afe338081baf64d8387e6b53c473a48
Fix:
37765437
Test: visual
Glen Kuhne [Tue, 2 May 2017 19:11:28 +0000 (12:11 -0700)]
Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.
Bug:
37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
TreeHugger Robot [Wed, 3 May 2017 22:52:22 +0000 (22:52 +0000)]
Merge "Add recent apps in app & notification"
jackqdyulei [Wed, 3 May 2017 18:23:33 +0000 (11:23 -0700)]
Update "Phone idle" subtext
Bug:
37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
TreeHugger Robot [Wed, 3 May 2017 22:20:09 +0000 (22:20 +0000)]
Merge "Add title and summary for "High usage" pref."
Fan Zhang [Wed, 3 May 2017 17:26:23 +0000 (10:26 -0700)]
Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.
Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix:
37933524
Test: robotests
TreeHugger Robot [Wed, 3 May 2017 22:01:29 +0000 (22:01 +0000)]
Merge "Fix a typo in the launch intent for emergency info."
fanzhang172 [Tue, 2 May 2017 02:15:17 +0000 (19:15 -0700)]
Add recent apps in app & notification
- Introduce a RecentAppsPreferenceControler, which queries
UsageStatsManager and displays a list of recently used apps.
- Add a control flag for this feature, intially set to false.
- Make ManageApplications a static pref item instead of dynamic one.
This makes the RecentAppController easier to control "See all"
preference, which is backed by ManageApplications.
- Also adjust app_items.xml layout to make app item UI consistent with
preference item.
Change-Id: I0b9e1784faed32b3055ebf96ef98b6a5e422de50
Fix:
33265548
Test: robotests
Daniel Nishi [Wed, 3 May 2017 18:09:27 +0000 (18:09 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev am:
833927929e
am:
f917c0aa24
Change-Id: I632e27fe03241818447998464e1bdbfe96f4c6e5
Daniel Nishi [Wed, 3 May 2017 18:09:00 +0000 (18:09 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev am:
0c58fbd345
am:
169fd4693f
Change-Id: I5328da37f430703540cb067256984ebafbe4ff59
Daniel Nishi [Wed, 3 May 2017 18:04:51 +0000 (18:04 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev
am:
833927929e
Change-Id: I569b89bcf10fa32f86978c80fb646c0d4503b89e
Daniel Nishi [Wed, 3 May 2017 18:04:17 +0000 (18:04 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev
am:
0c58fbd345
Change-Id: I4dbc750366d9fdbd6bc18abd751e47694de1d368
Daniel Nishi [Wed, 3 May 2017 18:00:18 +0000 (18:00 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev
Daniel Nishi [Wed, 3 May 2017 17:59:06 +0000 (17:59 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev
jackqdyulei [Fri, 28 Apr 2017 02:32:54 +0000 (19:32 -0700)]
Add title and summary for "High usage" pref.
The logic for this pref lives in AnomalyPreferenceController.
Bug:
36924669
Test: RunSettingsRoboTest
Change-Id: Ib88d8e76e1af8a2270fcb671baf55e9f6564b96e
Maurice Lam [Wed, 3 May 2017 16:21:30 +0000 (16:21 +0000)]
Merge "Include com.android.settings CodeInspectorTest"
Lorenzo Colitti [Wed, 26 Apr 2017 15:56:39 +0000 (00:56 +0900)]
Add a "sign into network" button to the wifi details page.
Bug:
36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
Maurice Lam [Wed, 3 May 2017 05:12:09 +0000 (22:12 -0700)]
Include com.android.settings CodeInspectorTest
Don't ignore classes directly under the package com.android.settings
in CodeInspectorTest.
Test: cd tests/robotests && mma
Change-Id: I4a6b00231839729405dd96a270e2dcbfef3b73c4
jackqdyulei [Wed, 3 May 2017 02:31:43 +0000 (02:31 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev am:
4b50e58a1d
am:
09adbd2f3b
Change-Id: I2d620d2fecf016434886ef67a5fa88128f722a6d
jackqdyulei [Wed, 3 May 2017 02:24:48 +0000 (02:24 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
am:
4b50e58a1d
Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
TreeHugger Robot [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
Lei Yu [Wed, 3 May 2017 00:49:33 +0000 (00:49 +0000)]
Merge "Add abnormal app page for battery settings"
Lei Yu [Wed, 3 May 2017 00:48:55 +0000 (00:48 +0000)]
Merge "Add wakelock anomaly detector"
Juan Lang [Wed, 3 May 2017 00:09:00 +0000 (17:09 -0700)]
Fix a typo in the launch intent for emergency info.
The EmergencyInfo app accepts either launch target for now. After this
is submitted, the misspelled one can be removed.
Test: Manually test that the Settings app still launches the
EmergencyInfo app. Reran unit tests.
Change-Id: I923468dbe9825e85b021f5ea64ee2877fd02f262
Daniel Sheng [Tue, 2 May 2017 23:21:24 +0000 (23:21 +0000)]
Merge "Camera Lift string tweaks"
jackqdyulei [Wed, 26 Apr 2017 21:25:51 +0000 (14:25 -0700)]
Add abnormal app page for battery settings
1. Add abnormal app page
2. Add strings for abnormal app page
3. Change AnomalyPreferenceController to open abnormal app page,
when there are more than one anomaly.
4. Add AnomalyPreference, who stores a reference of anomaly.
Also rename AnomalyPreferenceController to
AnomalySummaryPreferenceController because this controller is not
used to handle AnomalyPreference.
Following cls will add summary and icon for each abnormal app.
Bug:
37681665
Test: RunSettingsRoboTests
Change-Id: I4266f906476ff8daccd962572c8cfa99f948080a
Daniel Nishi [Mon, 1 May 2017 18:30:14 +0000 (11:30 -0700)]
Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.
This fixes this by double-checking the Files visibility status whenever
we set the volume.
Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes:
37790776
Test: Settings robotest
jackqdyulei [Tue, 2 May 2017 22:16:19 +0000 (15:16 -0700)]
Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.
Bug:
37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
jackqdyulei [Wed, 26 Apr 2017 01:22:45 +0000 (18:22 -0700)]
Add wakelock anomaly detector
This cl detects whether apps hold wakelock for long time.
For now we use the following attribute:
1. Longest total duration time among all the wakelocks
for one app.
Following cl will:
1. Get threshold from server side.
2. Add more attributes to make the detection more robust.
Bug:
36925184
Test: RunSettingsRoboTests
Change-Id: I1946faf69c363f6aa823d0005d6e03bc9082c085
TreeHugger Robot [Tue, 2 May 2017 19:55:13 +0000 (19:55 +0000)]
Merge "Remove custom layout for expandpreference."
Matthew Fritze [Tue, 2 May 2017 19:45:09 +0000 (19:45 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev am:
d51b94b042
am:
68824ba600
Change-Id: I0e8d2965c10947db09832ee7dfd4d1a4bc8aaa17
Matthew Fritze [Tue, 2 May 2017 19:29:18 +0000 (19:29 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
am:
d51b94b042
Change-Id: I2b915166c5a52082bfb0c4dff52ea9101f5c2514
TreeHugger Robot [Tue, 2 May 2017 19:25:52 +0000 (19:25 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 19:07:42 +0000 (19:07 +0000)]
Merge "Remove accessibility duplicates in settings search"
Fan Zhang [Tue, 2 May 2017 18:12:20 +0000 (11:12 -0700)]
Remove custom layout for expandpreference.
It's no longer needed.
Test: manual
Change-Id: I704255ee217d1142ac81c738feef212224bae4e8
Miao Miao (苗苗) [Tue, 2 May 2017 17:54:44 +0000 (17:54 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b am:
c6e3467cc2 am:
b1480c8cab
am:
d0cb54b27e
Change-Id: I7430b38a73cf22b823121db3c2287f3afdb63d79
Miao Miao (苗苗) [Tue, 2 May 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b am:
c6e3467cc2
am:
b1480c8cab
Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
Miao Miao (苗苗) [Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b
am:
c6e3467cc2
Change-Id: If6ad081e117a94df84d041776649af63c392cc30
Miao Miao (苗苗) [Tue, 2 May 2017 17:44:08 +0000 (17:44 +0000)]
Merge "Settings crash when receiving data state broadcast"
am:
2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
Matthew Fritze [Mon, 24 Apr 2017 23:32:52 +0000 (16:32 -0700)]
Prevent empty non-Indexable keys from being added
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes:
37646265
Test: make RunSettingsRoboTests
Treehugger Robot [Tue, 2 May 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Settings crash when receiving data state broadcast"
Matthew Fritze [Mon, 17 Apr 2017 14:55:41 +0000 (07:55 -0700)]
Remove accessibility duplicates in settings search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
Kevin Chyn [Tue, 2 May 2017 17:22:40 +0000 (17:22 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev am:
f1f35ee107
am:
19323ca297
Change-Id: I64d6590b9e757e99005ce7a3f9f01ad5fd11f5fe
Kevin Chyn [Tue, 2 May 2017 17:16:09 +0000 (17:16 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
am:
f1f35ee107
Change-Id: I105ef25110a9c7b158c08f61f5e0b4354490218e
TreeHugger Robot [Tue, 2 May 2017 17:12:20 +0000 (17:12 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:09:37 +0000 (17:09 +0000)]
Merge "Filter on volume for category storage view." into oc-dev am:
a41a190ac3
am:
854acc9e4b
Change-Id: I21c985df9ee34981b47c080756df5dc442f335b6
Daniel Nishi [Tue, 2 May 2017 17:09:08 +0000 (17:09 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev am:
b4937f4556
am:
88c721116b
Change-Id: I46f64ee45e2dc0941719e9d53abc0f4cba0fa79a
Daniel Nishi [Tue, 2 May 2017 17:07:02 +0000 (17:07 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
am:
a41a190ac3
Change-Id: I967f4fd28c5375f0c56ad88dedc47a484918b629
Daniel Nishi [Tue, 2 May 2017 17:06:36 +0000 (17:06 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
am:
b4937f4556
Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
Daniel Nishi [Tue, 2 May 2017 17:03:36 +0000 (17:03 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:12 +0000 (17:03 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
The Android Open Source Project [Tue, 2 May 2017 16:34:46 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
23550fdcd3 -s ours
am:
ad5649043e -s ours
Change-Id: I079f1dd525e204ec7905550ea0525c1509283066
Jeremy Joslin [Fri, 28 Apr 2017 23:40:51 +0000 (16:40 -0700)]
Allow "None" to be selected as a Network rating provider.
Updated the picker to always provide "None" as an option. The
preference is only disabled if there a no valid scorers installed.
Existing tests updated and new tests added.
Bug:
37722313
Test: make RunSettingsRoboTests -j40
Test: manual on device clicking.
Change-Id: Ie6fd9f29e0ea3c64845dd98ce1d117013f50c86b
The Android Open Source Project [Tue, 2 May 2017 15:59:49 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
23550fdcd3 -s ours
Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8
TreeHugger Robot [Tue, 2 May 2017 15:46:54 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:10:57 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Tue, 2 May 2017 09:06:19 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 2 May 2017 08:35:16 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7759ea372b0386d5a275424525c5fb4b9d283173
Auto-generated-cl: translation import
Kevin Chyn [Tue, 2 May 2017 04:23:31 +0000 (04:23 +0000)]
Revert "Swipe for notification should be default-on in settings app"
This reverts commit
a95c2c3a8d65d191260d4948a54eee1c74dac3fa.
Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
Kevin Chyn [Tue, 2 May 2017 04:20:45 +0000 (04:20 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev am:
9ab1318ca8
am:
f921f8e77e
Change-Id: I3337bcba8a7baa4038f7c72d8eb9658311c0c435
Kevin Chyn [Tue, 2 May 2017 04:14:47 +0000 (04:14 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
am:
9ab1318ca8
Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
TreeHugger Robot [Tue, 2 May 2017 04:09:30 +0000 (04:09 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
Fan Zhang [Tue, 2 May 2017 02:32:39 +0000 (02:32 +0000)]
Merge "Update vpn icon from setting gear to vpn key." into oc-dev am:
74327fa4f0
am:
403a4ee11a
Change-Id: I29538740df4794e0b427f31bc62a4380e40686f3
OSDN Git Service
