OSDN Git Service
Sean Callanan [Thu, 26 Apr 2018 17:20:45 +0000 (10:20 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev am:
9b08ed63e9
am:
7187243565
Change-Id: I49aefbb3c01760977e07535dc305921ceb548b6b
Sean Callanan [Thu, 26 Apr 2018 17:04:44 +0000 (10:04 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev
am:
9b08ed63e9
Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd
Sean Callanan [Thu, 26 Apr 2018 16:39:51 +0000 (16:39 +0000)]
Merge "Settings: update color mode preview to final content" into pi-dev
Jason Monk [Thu, 26 Apr 2018 12:56:47 +0000 (05:56 -0700)]
Merge "Fix settings slice caching" into pi-dev am:
ab3aa6989a
am:
fa5e0ece68
Change-Id: Ia88dc12ead0cab4b335062cba4fbf7db8066e285
Jason Monk [Thu, 26 Apr 2018 12:50:45 +0000 (05:50 -0700)]
Merge "Fix settings slice caching" into pi-dev
am:
ab3aa6989a
Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3
Jason Monk [Thu, 26 Apr 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Fix settings slice caching" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 04:35:54 +0000 (21:35 -0700)]
[automerger skipped] Merge "Use colorPrimary for search bar and suggestion background" into pi-dev am:
a6b773a3e1
am:
237260dfba -s ours
Change-Id: Icf0c5752f5bb7774383f1bbf591fc5e5284fbd0b
Fan Zhang [Thu, 26 Apr 2018 04:31:02 +0000 (21:31 -0700)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
am:
a6b773a3e1
Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
TreeHugger Robot [Thu, 26 Apr 2018 04:27:30 +0000 (04:27 +0000)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 02:50:46 +0000 (02:50 +0000)]
Merge "Implement LifecycleObserver in pulse notif controller."
Fan Zhang [Thu, 26 Apr 2018 02:41:48 +0000 (02:41 +0000)]
Merge "Use colorPrimary for search bar and suggestion background"
TreeHugger Robot [Thu, 26 Apr 2018 02:40:34 +0000 (02:40 +0000)]
Merge "Replace PackageManagerWrapper with PackageManager"
Sean Callanan [Thu, 26 Apr 2018 02:38:21 +0000 (19:38 -0700)]
Settings: update color mode preview to final content
Content provided based on image selection and optimization
by the graphics team.
Bug:
69264342
Test: hand testing on B1
Change-Id: I12d1fefab2d7a01a44fccb4960d61ee2c6a25017
Fan Zhang [Thu, 26 Apr 2018 00:50:23 +0000 (17:50 -0700)]
Implement LifecycleObserver in pulse notif controller.
Change-Id: Icb8d55c5a72bc6a8d6566c43e193b7f12377b4c9
Fixes:
74923755
Test: manually run through lifecycle
Test: atest CodeInspectionTest
Antony Sargent [Thu, 26 Apr 2018 01:01:30 +0000 (18:01 -0700)]
Merge "Layout changes for new animation assets" into pi-dev am:
10e91c7e1b
am:
7746cd94e3
Change-Id: I1828a02d9c08a1fd79ec1accdeffb6d4efb3a417
Antony Sargent [Thu, 26 Apr 2018 00:52:26 +0000 (17:52 -0700)]
Merge "Layout changes for new animation assets" into pi-dev
am:
10e91c7e1b
Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
TreeHugger Robot [Thu, 26 Apr 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Layout changes for new animation assets" into pi-dev
Jan Nordqvist [Wed, 18 Apr 2018 22:20:03 +0000 (15:20 -0700)]
Hiding data remaining text when available space is too small.
Bug:
77799887
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53390a36e74f9832bdc7757cd67d51064e8a77f3
Antony Sargent [Mon, 23 Apr 2018 22:34:32 +0000 (15:34 -0700)]
Layout changes for new animation assets
The animation videos are changing to have a white background, so we want to
match that in the background color to avoid horizontal bands of the current
grey background color on the edges of the new videos. We're also adding a
divider between the video and the content beneath it.
This CL also includes the new illustration video for the launcher gesture.
Fixes:
77861241
Fixes:
77474484
Test: manual (visit all entries in Settings->System->Gestures, as well as
Settings->Display->Adaptive brightness)
Change-Id: I976782645c9431d40e005960b80353a7da2b89b8
Fan Zhang [Wed, 25 Apr 2018 19:40:14 +0000 (12:40 -0700)]
Use colorPrimary for search bar and suggestion background
Bug:
78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Merged-In: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Fan Zhang [Wed, 25 Apr 2018 21:41:59 +0000 (14:41 -0700)]
[automerger skipped] Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev am:
5605795526
am:
7d4a11e3d3 -s ours
Change-Id: I65653749d989a051d4cbadc528701c41ec691038
Fan Zhang [Wed, 25 Apr 2018 19:40:14 +0000 (12:40 -0700)]
Use colorPrimary for search bar and suggestion background
Bug:
78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Fan Zhang [Wed, 25 Apr 2018 21:36:26 +0000 (14:36 -0700)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
am:
5605795526
Change-Id: I82717663e3fb2cd95dd9e4a51839b3d0027440d4
Fan Zhang [Wed, 25 Apr 2018 21:28:15 +0000 (21:28 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
Ivan Chiang [Wed, 25 Apr 2018 19:43:01 +0000 (12:43 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev am:
820a26c6bd
am:
e7f3afba9d
Change-Id: I0b1e8dd9f23b2077051341a991f309ace42cbb34
Ivan Chiang [Wed, 25 Apr 2018 19:36:25 +0000 (12:36 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
am:
820a26c6bd
Change-Id: Ie77ac8eb096ebfa37445233481ad31d9511c1b7e
TreeHugger Robot [Wed, 25 Apr 2018 19:21:56 +0000 (19:21 +0000)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
hjchangliao [Wed, 25 Apr 2018 17:23:11 +0000 (10:23 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev am:
dc09b3ff49
am:
f549cd1e05
Change-Id: Ied4f01787aec0cf8f261483e942615abd1889918
Doris Ling [Wed, 25 Apr 2018 17:22:36 +0000 (10:22 -0700)]
Merge "Fixes crash in security settings." into pi-dev am:
abe44c2674
am:
c7494be56e
Change-Id: I06db8956a4cb67aa650b7b32dab1c83130d7a97a
hjchangliao [Wed, 25 Apr 2018 17:16:41 +0000 (10:16 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am:
dc09b3ff49
Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7
Doris Ling [Wed, 25 Apr 2018 17:16:05 +0000 (10:16 -0700)]
Merge "Fixes crash in security settings." into pi-dev
am:
abe44c2674
Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b
TreeHugger Robot [Wed, 25 Apr 2018 17:13:48 +0000 (17:13 +0000)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
hjchangliao [Wed, 25 Apr 2018 03:38:05 +0000 (11:38 +0800)]
Make Nfc/Beam searchable based on feature availability
Update logic of updateNonIndexableKeys,
in BaseNfcPreferenceController to fix issue.
Add robotest to avoid same problem.
Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c
Fixes:
78540155
Test: make RunSettingsRoboTests
Doris Ling [Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)]
Merge "Fixes crash in security settings." into pi-dev
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl
Also convert the controller to TogglePrefCtrl, and register it in xml.
Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Merged-In: Ifbc95364b47690117b2875cba1cdc4761ad205be
Fixes:
71972185
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 25 Apr 2018 15:25:54 +0000 (08:25 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev am:
69d12406f0
am:
e9045a7a41
Change-Id: I20c27b31caa7a44b6d114780a0b7b18206f75d12
Fan Zhang [Wed, 25 Apr 2018 15:14:28 +0000 (08:14 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
am:
69d12406f0
Change-Id: I9e209e042b129f9c1e92878c11ec6affa4e40ccb
TreeHugger Robot [Wed, 25 Apr 2018 15:07:32 +0000 (15:07 +0000)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
caxtonchan [Wed, 25 Apr 2018 04:04:45 +0000 (21:04 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev am:
3f5444b9e4
am:
67d44d9d61
Change-Id: I36b249159ef8d0a6d099ba776c5d682ea596e5e3
caxtonchan [Wed, 25 Apr 2018 03:54:43 +0000 (20:54 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
am:
3f5444b9e4
Change-Id: Ie376aafe5ebfff928e5011ac772f5faaeb494c0d
TreeHugger Robot [Wed, 25 Apr 2018 03:42:17 +0000 (03:42 +0000)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
Salvador Martinez [Wed, 25 Apr 2018 02:13:32 +0000 (19:13 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev am:
6fcce25b72
am:
f6d5f31564
Change-Id: I8b59411b62292b8f65a62f60bde8981c66f3401a
Salvador Martinez [Wed, 25 Apr 2018 02:08:51 +0000 (19:08 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev
am:
6fcce25b72
Change-Id: Ia85fbd3b5068f739254fae45403fdf2f4b45f595
TreeHugger Robot [Wed, 25 Apr 2018 02:00:48 +0000 (02:00 +0000)]
Merge "Check if boxes still available when restoring state" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 01:36:51 +0000 (01:36 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl"
caxtonchan [Mon, 23 Apr 2018 07:04:21 +0000 (15:04 +0800)]
Hide the audio switcher if it is not relevant
Bug:
78317337
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Change-Id: I9824941cf410b26ad166aa163d7cccd3bfc31a06
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl
Also convert the controller to TogglePrefCtrl, and register it in xml.
Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Bug:
71972185
Test: make RunSettingsRoboTests
Doris Ling [Tue, 24 Apr 2018 20:19:27 +0000 (13:19 -0700)]
Fixes crash in security settings.
- save the loaded icon drawable to a local var, instead of setting it to
the tile.icon and later reset it, so that we will not run into the issue
that the icon will become null when this is called multiple times.
Change-Id: I0fc73961986cddd97ad1e74b0609ac47d011cc87
Fixes:
78445923
Test: make RunSettingsRoboTests
Doris Ling [Tue, 24 Apr 2018 22:55:40 +0000 (15:55 -0700)]
Fix Data warning title not translated. am:
1cf0dfd3b2
am:
432ff5e455
Change-Id: I22bdb65a2d91b1992a4890a1fdca6a01fca925aa
Doris Ling [Tue, 24 Apr 2018 22:44:52 +0000 (15:44 -0700)]
Fix Data warning title not translated.
am:
1cf0dfd3b2
Change-Id: I8bb8187c3a70afbaa32674e56c4ede29b503b1e8
Jason Monk [Tue, 24 Apr 2018 21:08:26 +0000 (17:08 -0400)]
Fix settings slice caching
Previously if there were multiple clients it would trigger an infinite
loop as the cache gits dropped after the first bind, and the second
client would trigger another load. Instead now cache as long as slices
are pinned since thats the intended behavior of caching.
Test: make RunSettingsRoboTests
Change-Id: I7d29fab87573120b34cd55e1696c4c5b70fc891c
Fixes:
78471335
Doris Ling [Tue, 24 Apr 2018 20:42:19 +0000 (13:42 -0700)]
Fix Data warning title not translated.
- change to use the title resource id instead of getting the title from
the preference, so that it can react to language change properly.
Change-Id: I7f4b3c49ef1622b3d90bf035597742cac6f7af3c
Fixes:
78318536
Test: run i18nscreenshots
Fan Zhang [Tue, 24 Apr 2018 18:31:58 +0000 (11:31 -0700)]
Update brightness percentage display logic to match sysui.
The brightness raw value is in linear pace, we need to convert
it to gamma space to make it match the way sysui represents the
brightness level.
Bug:
73810208
Change-Id: Ic4551bbeff4a6af30f7af2871a79a7d797279edb
Fixes:
78173473
Test: robotests
HJ ChangLiao [Tue, 24 Apr 2018 17:35:46 +0000 (10:35 -0700)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev am:
465f6da15b
am:
f1a94be5d4
Change-Id: I2f04be621d0a121cfc51e6fefa02a493426172ad
HJ ChangLiao [Tue, 24 Apr 2018 17:23:56 +0000 (10:23 -0700)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev
am:
465f6da15b
Change-Id: Ie34ee8d62197bf7e4cfb2e25d5ff71445f2aa9a4
TreeHugger Robot [Tue, 24 Apr 2018 17:19:52 +0000 (17:19 +0000)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 13:33:31 +0000 (06:33 -0700)]
Merge "Switch to new checkPasswordHistory method" into pi-dev am:
4a1b84e613
am:
399675408d
Change-Id: I53198b254e2e93aee0ab8a7e980e46bd20745e05
Rubin Xu [Tue, 24 Apr 2018 13:23:16 +0000 (06:23 -0700)]
Merge "Switch to new checkPasswordHistory method" into pi-dev
am:
4a1b84e613
Change-Id: Ife2084277acf19f93352e23eae82eb38519a8be1
TreeHugger Robot [Tue, 24 Apr 2018 13:06:57 +0000 (13:06 +0000)]
Merge "Switch to new checkPasswordHistory method" into pi-dev
HJ ChangLiao [Tue, 24 Apr 2018 07:12:31 +0000 (15:12 +0800)]
Replace PackageManagerWrapper with PackageManager
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.
Bug:
62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
HJ ChangLiao [Wed, 18 Apr 2018 09:28:21 +0000 (17:28 +0800)]
Add intent receiver in BatterySaverCondition
Receive ACTION_POWER_SAVE_MODE_CHANGING
to listen state and update immediately.
Change-Id: Iff2ebb262d95f43d0c970b32f326e3a3e6981a2a
Fixes:
78104542
Test: make RunSettingsRoboTests
George Huang [Tue, 24 Apr 2018 02:28:35 +0000 (02:28 +0000)]
Merge "Fix RTL alignmnet of "eSIMs" in "Erase all data" page."
Doris Ling [Tue, 24 Apr 2018 02:00:53 +0000 (19:00 -0700)]
Fix footer text not translated in Magnification settings. am:
b0877b390d
am:
84506b36c5
Change-Id: Iab1c7df7fb56b76f3dcacc13608d23bbdcfeda51
Doris Ling [Tue, 24 Apr 2018 01:49:08 +0000 (18:49 -0700)]
Fix footer text not translated in Magnification settings.
am:
b0877b390d
Change-Id: I3ad2795e60b3f2147f9611b54b014aa491077ce7
Doris Ling [Fri, 20 Apr 2018 23:42:10 +0000 (16:42 -0700)]
Fix footer text not translated in Magnification settings.
- pass in the summary res id instead of the actual text when building
the launch bundle for the magnification settings.
- remove the title argument as we are passing the title res already,
which takes precedence.
Change-Id: I4ba624e1d9722aa980ea94c306df9a015a159555
Fixes:
78126057
Test: run i18nscreenshots
Salvador Martinez [Mon, 23 Apr 2018 23:52:25 +0000 (16:52 -0700)]
Check if boxes still available when restoring state
Apparently when the device is idle long enough the system will clean
up the dialog view for the hotspot band preference. This will cause
restore state to fail once it decides to pause the activity. To avoid
this we should make sure the boxes are not null.
Test: robotest
Bug:
78445411
Change-Id: I2a82b01f894f62be6c5209c78faddc4089aa6301
TreeHugger Robot [Mon, 23 Apr 2018 23:35:23 +0000 (23:35 +0000)]
Merge "Use entity header to show account name in sync detail page"
TreeHugger Robot [Mon, 23 Apr 2018 23:00:37 +0000 (23:00 +0000)]
Merge "Create a new string for keyboard disconnected state"
Fan Zhang [Fri, 6 Apr 2018 00:47:40 +0000 (17:47 -0700)]
Use entity header to show account name in sync detail page
Also removed a bunch of outdated layout and drawables.
Change-Id: I38094d72b84fab1309163f641c4019349f5d6ee7
Fixes:
77657624
Test: visual
Salvador Martinez [Mon, 23 Apr 2018 22:11:47 +0000 (15:11 -0700)]
Merge "Disable hidden network spinner on existing networks" into pi-dev am:
ac951a69aa
am:
062dbc2054
Change-Id: I29b27335730594d70805a14ac74d948d6dbef509
Fan Zhang [Mon, 23 Apr 2018 21:58:39 +0000 (14:58 -0700)]
Create a new string for keyboard disconnected state
Change-Id: I454bbb3b8e0ee22c0f7a5a340b86dfd5607de86e
Fixes:
77957016
Test: robotests
TreeHugger Robot [Mon, 23 Apr 2018 21:57:05 +0000 (21:57 +0000)]
Merge "TrustAgentSettings use DashboardFragment"
Salvador Martinez [Mon, 23 Apr 2018 21:55:19 +0000 (14:55 -0700)]
Merge "Disable hidden network spinner on existing networks" into pi-dev
am:
ac951a69aa
Change-Id: I2fcd1b9dbd807dee783ea0027ab7c9b8e2ff369e
TreeHugger Robot [Mon, 23 Apr 2018 21:38:55 +0000 (21:38 +0000)]
Merge "Disable hidden network spinner on existing networks" into pi-dev
Lei Yu [Mon, 23 Apr 2018 21:37:30 +0000 (14:37 -0700)]
Update insert method for battery database am:
4bfbaa6047
am:
71dca7d131
Change-Id: Id7d1247efd12ead31584e46126108b5370bd1101
Lei Yu [Mon, 23 Apr 2018 21:37:11 +0000 (14:37 -0700)]
Add primary key for anomaly database. am:
0fcddc77c7
am:
8870486f65
Change-Id: Ic89ea460dd33f740b3c7fe66cd0cbdd4de84e1ad
Lei Yu [Mon, 23 Apr 2018 21:28:14 +0000 (14:28 -0700)]
Update insert method for battery database
am:
4bfbaa6047
Change-Id: I69bed4d6ae38dc101878e342e14aa33199f2e810
Lei Yu [Mon, 23 Apr 2018 21:27:59 +0000 (14:27 -0700)]
Add primary key for anomaly database.
am:
0fcddc77c7
Change-Id: I92c7aae2bf77c31863fa1f8191bec104f73097b4
Mill Chen [Fri, 13 Apr 2018 03:59:19 +0000 (03:59 +0000)]
TrustAgentSettings use DashboardFragment
- Remove dummy preference from trust_agent_setting.xml.
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
Bug:
73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.search
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: Ideae0c1e7311d7647cf522e01592822e565a0ff7
Lei Yu [Fri, 20 Apr 2018 17:51:33 +0000 (10:51 -0700)]
Update insert method for battery database
1. Add conflict code to ignore the confliction and return -1 when
insert fails.
2. Add boolean return value to show whether insert sucessfully
3. Add unit test. We don't write robo test because robolectirc use
"update" to shadow "insert" operation, which returns the wrong data.
Bug:
77968649
Test: SettingsUnitTest
Change-Id: Ibd3b53cdb1796d74ea4a2ca1f067e2b302b939e9
Lei Yu [Fri, 20 Apr 2018 00:37:18 +0000 (17:37 -0700)]
Add primary key for anomaly database.
In this case it won't insert the duplicate data. We don't do migration since
anomaly database only contains transient data.
Bug:
77968649
Test: test still pass
Change-Id: I638564d89ead008ec184b9a4db137436d47df5bc
jackqdyulei [Mon, 23 Apr 2018 18:17:08 +0000 (11:17 -0700)]
Fix the wrong import
Use androidx.annotation.VisibleForTesting
Test: Build
Change-Id: I666118ac61c6ba36391203af0a5b51dc02024793
Salvador Martinez [Mon, 23 Apr 2018 17:50:22 +0000 (10:50 -0700)]
Disable hidden network spinner on existing networks
We only want this to be modifiable if you are adding a network
manually, so this CL disables it for existing networks. You
can still see what the spinner is set to though.
Test: robotests
Bug:
78436456
Change-Id: If660e432eca2dabf5bd16881368657ee89fe5a57
TreeHugger Robot [Mon, 23 Apr 2018 17:48:12 +0000 (17:48 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
Lei Yu [Mon, 23 Apr 2018 17:13:31 +0000 (10:13 -0700)]
Merge "Fix bugs in auto restriction." into pi-dev am:
f6e2c19fcc
am:
a9e4d4a42a
Change-Id: If82969696eb492ea3875a0e0fb92f038024f00f9
Lei Yu [Mon, 23 Apr 2018 17:12:29 +0000 (10:12 -0700)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev am:
10280a53b0
am:
a4ef6f51be
Change-Id: I6585d866d4a8e2c54783a874d09821dc727e4941
Lei Yu [Mon, 23 Apr 2018 17:09:08 +0000 (10:09 -0700)]
Merge "Fix bugs in auto restriction." into pi-dev
am:
f6e2c19fcc
Change-Id: I2fd187d163c789ade85c40e00d44f58fea18d0be
Lei Yu [Mon, 23 Apr 2018 17:08:33 +0000 (10:08 -0700)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev
am:
10280a53b0
Change-Id: I8d90eec324ddfcb0123247e2e0e37aa6f6f94ab8
Lei Yu [Mon, 23 Apr 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Fix bugs in auto restriction." into pi-dev
Lei Yu [Mon, 23 Apr 2018 16:59:47 +0000 (16:59 +0000)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev
Pavel Grafov [Mon, 23 Apr 2018 16:51:49 +0000 (09:51 -0700)]
Merge "Pick default notification setting for work profile" into pi-dev am:
bb839f81e3
am:
0bdd7cf4f2
Change-Id: Id9c0d04e816f891df7e180974af104edac04905e
Pavel Grafov [Mon, 23 Apr 2018 16:48:26 +0000 (09:48 -0700)]
Merge "Pick default notification setting for work profile" into pi-dev
am:
bb839f81e3
Change-Id: I8ccd32b12b9da892b5f38d4a95e3217bc8183dcc
TreeHugger Robot [Mon, 23 Apr 2018 16:38:43 +0000 (16:38 +0000)]
Merge "Pick default notification setting for work profile" into pi-dev
George Huang [Thu, 19 Apr 2018 10:04:58 +0000 (18:04 +0800)]
Fix RTL alignmnet of "eSIMs" in "Erase all data" page.
"eSIMs" is not a RTL string, so it will align to left even we change to
RTL language like Urdu. We must set the textDirection of TextView to
"locale" to force it follow locale's direction. We don't use
textAlignment to set string direction because it contains list bullets,
and list bullets will still align to left.
Change-Id: I0eea2bed9f324bb071e413673227839b830921cf
Fixes:
77946796
Test: visual
Bill Yi [Sat, 21 Apr 2018 05:17:53 +0000 (22:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
77e716e463 -s ours
am:
993bc3fcc6 -s ours
Change-Id: Ie3f3ccfe4883b4c03787305b49886babaad498b0
Bill Yi [Sat, 21 Apr 2018 05:13:51 +0000 (22:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
77e716e463 -s ours
Change-Id: I9696a4c10e97d66c36a4eaca2c1947cb528ecb01
TreeHugger Robot [Sat, 21 Apr 2018 05:09:44 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 04:58:43 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Sat, 21 Apr 2018 03:37:34 +0000 (20:37 -0700)]
[automerger skipped] Merge "Catch exception when failing to create slice" into pi-dev am:
524babb389
am:
f060f89b6f -s ours
Change-Id: I0ae2d9494634c7bb98b28a9022e4177f54a6414e
Matthew Fritze [Sat, 21 Apr 2018 03:27:02 +0000 (20:27 -0700)]
Merge "Add keywords to Slices" into pi-dev am:
2f911e2e9e
am:
21521826d9
Change-Id: I38d9efabcdecf3c40f1af28ecd167e58c2586ca7
OSDN Git Service
