OSDN Git Service
Android Build Merger (Role) [Wed, 16 Aug 2017 19:51:50 +0000 (19:51 +0000)]
Merge "Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours am:
f52c8ccbfc -s ours" into oc-dr1-dev-plus-aosp
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours
am:
baf4375f01 -s ours
Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours
am:
f52c8ccbfc -s ours
Change-Id: I22a9fd9d0713277fa591b5a0ef7f6958931588b9
Suprabh Shukla [Wed, 16 Aug 2017 19:49:08 +0000 (19:49 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours
am:
aedf7cdfdb -s ours
Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080
Suprabh Shukla [Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours
am:
aedf7cdfdb -s ours
Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a
Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52
am:
616c84ccb0 -s ours
Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef
Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41
am:
1370eb3d52
Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d
am:
1e9af33c41
Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am:
8e08a9bb71
am:
08207f457d
Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am:
8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
Nick Desaulniers [Wed, 16 Aug 2017 18:44:56 +0000 (18:44 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am:
33046b4ec2 -s ours am:
f25a418e24
am:
e625c2f64e
Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b
Nick Desaulniers [Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am:
33046b4ec2 -s ours
am:
f25a418e24
Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804
Nick Desaulniers [Wed, 16 Aug 2017 18:34:27 +0000 (18:34 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am:
33046b4ec2 -s ours
Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9
Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]
DeviceInfoSettingsTest: test parsing llvm kernel
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.
Bug:
32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
d8d29f2964 -s ours
Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319
Bill Yi [Mon, 14 Aug 2017 13:32:35 +0000 (13:32 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a2a4037f593b6bbbe5c178971f13ef869b7ffe8e.
Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am:
a2a4037f59 -s ours
Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a
Bill Yi [Sat, 12 Aug 2017 15:56:25 +0000 (08:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Thu, 10 Aug 2017 22:29:23 +0000 (22:29 +0000)]
Initialize the volume seekbar preference max and progress.
am:
cbc231c545
Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
Initialize the volume seekbar preference max and progress.
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.
Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix:
34035654
Test: make RunSettingsRoboTests
(cherry picked from commit
b7490bea28cb28d301fe4ec0275cef7129621206)
Antony Sargent [Thu, 10 Aug 2017 07:25:52 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am:
49cd8f2327
Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:30 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
9476e824be
Change-Id: I7aa611840a3e14476f7f637be866920b5723d39c
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:29 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Antony Sargent [Wed, 9 Aug 2017 22:57:17 +0000 (15:57 -0700)]
Stay discoverable in Bluetooth settings and pairing pages
There are two problems with the Bluetooth settings and pairing pages
that are fixed by this CL:
(1) We advertise on the page that the local device is visible to other
devices, but that only lasts for the length of the default timeout (120
seconds) for the local adapter being in discoverable mode.
(2) Both the BluetoothSettings and BluetoothPairingDetail fragments
enter discoverable mode in their onStart handler and exit it in their
onStop handler. Unfortunately when doing a fragment navigation the
onStart and onStop events interleave in a non-intuitive manner. When you
go from BluetoothSettings to BluetoothPairingDetail, we see the onStop
event for BluetoothSettings *after* the onStart event for
BluetoothPairingDetail, and similarly when going back from
BluetoothSettings to BluetoothPairingDetail. What this means in practice
is that if you go to the BluetoothSettings page, the device will be
discoverable, but once you navigate to BluetoothPairingDetail or back
again you won't be discoverable again until you go somewhere else or end
the settings activity.
This CL adds a new object called AlwaysDiscoverable which can be used to
start and stop a mode of "always being discoverable". While started, it
will listen for changes to the discoverable state, and return to
discoverable mode. This fixes (1) by returning to discoverable mode
whenever the normal timeout expires, and (2) similary by returning to
discoverable mode when we accidentally exit it due to the onStop/onStart
mismatch.
A better fix for (2) would be to avoid the "glitch" of briefly exiting
discoverable mode only to re-enter it, but the implementation of that is
a little more complicated so that's being left as future work in order
to keep this CL as small as possible.
Bug:
64130265
Test: make RunSettingsRoboTests
Change-Id: I559dd8187263ea6a0008be1a8abdfffac97cb87a
Justin Klaassen [Thu, 10 Aug 2017 00:23:52 +0000 (00:23 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa
Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
Jayachandran C [Tue, 8 Aug 2017 20:06:51 +0000 (13:06 -0700)]
Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM
Bug:
64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
qqzhou [Wed, 9 Aug 2017 21:07:36 +0000 (21:07 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 19:27:58 +0000 (19:27 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959
Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
Matthew Fritze [Wed, 9 Aug 2017 19:26:10 +0000 (19:26 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78
Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
Daniel Nishi [Wed, 9 Aug 2017 19:25:35 +0000 (19:25 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:15:27 +0000 (19:15 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
mingliang.x.lei [Wed, 9 Aug 2017 18:53:07 +0000 (18:53 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad
am:
c46b5e60b9
Change-Id: I1c8766701e83c9354bebf6554742c24756de7117
mingliang.x.lei [Wed, 9 Aug 2017 18:36:33 +0000 (18:36 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286
am:
8d3bb3e2ad
Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f
mingliang.x.lei [Wed, 9 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Fix memory leak in Bluetooth settings"
am:
5a652c0286
Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
Treehugger Robot [Wed, 9 Aug 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Fix memory leak in Bluetooth settings"
The Android Open Source Project [Wed, 9 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: Ibdf27617dfdd337155c1d2bbc756621234bdf515
Daniel Nishi [Wed, 9 Aug 2017 16:30:01 +0000 (16:30 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
TreeHugger Robot [Wed, 9 Aug 2017 16:20:46 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 16:16:49 +0000 (16:16 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
qqzhou [Mon, 3 Jul 2017 07:10:59 +0000 (15:10 +0800)]
Settings: Fix NPE in ChannelNotificationSettings
java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.
Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed:
2068192
Fixes:
64116799
Fixes:
64134707
Test: monkey
Ruchi Kandoi [Wed, 9 Aug 2017 05:38:23 +0000 (05:38 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am:
9eff3f90d8
Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
Ruchi Kandoi [Wed, 9 Aug 2017 05:29:12 +0000 (05:29 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: I7396107e4ed06982c8cd300912ce1f4e3c63df4c
Merged-In: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
The Android Open Source Project [Wed, 9 Aug 2017 01:20:51 +0000 (18:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d4e5680aca99f0d47353175e796b0b3a0116598
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Salvador Martinez [Wed, 9 Aug 2017 01:20:24 +0000 (01:20 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
am:
4bcc3eb193
Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
TreeHugger Robot [Wed, 9 Aug 2017 01:06:50 +0000 (01:06 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 00:29:46 +0000 (17:29 -0700)]
Expose the notification-swipe controls.
Bug:
62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
Andrew Sapperstein [Wed, 9 Aug 2017 00:20:03 +0000 (00:20 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Maurice Lam [Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6
am:
d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef
am:
dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Salvador Martinez [Tue, 8 Aug 2017 22:08:50 +0000 (22:08 +0000)]
Refactor tether logic for reuse
am:
135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
Salvador Martinez [Mon, 7 Aug 2017 20:59:16 +0000 (13:59 -0700)]
Update availability for mobile network
This CL updates the availability to behave properly when a
user other than the primary user is accessing it. This also
makes the api return no intent if they don't have permission to
access this because attempting to go to that screen will cause a
crash. Also updates tests related to this change.
Test: robotests still pass
Bug:
64092292
Change-Id: If9913d9ae08ee3e205ff324aaeeadc755ff1d23d
Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
Ruchi Kandoi [Tue, 8 Aug 2017 20:41:31 +0000 (13:41 -0700)]
Avoid Race condition with accessibility for NFC toggle switch
Bug:
64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
Andrew Sapperstein [Tue, 8 Aug 2017 02:06:57 +0000 (19:06 -0700)]
Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.
Bug:
64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug:
64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I7c99272f330d9d5fa043c155d2f818e70ac271e0
Merged-In: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
Salvador Martinez [Thu, 3 Aug 2017 20:56:10 +0000 (13:56 -0700)]
Refactor permissions code for bluetooth controller enabler
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug:
62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
Matthew Fritze [Mon, 7 Aug 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395
Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
TreeHugger Robot [Mon, 7 Aug 2017 16:53:29 +0000 (16:53 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
Bill Yi [Mon, 7 Aug 2017 06:02:28 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours
am:
335a436998 -s ours
Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
Bill Yi [Mon, 7 Aug 2017 05:50:24 +0000 (05:50 +0000)]
Import translations. DO NOT MERGE
am:
c89d5b0093 -s ours
Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
Bill Yi [Sun, 6 Aug 2017 17:38:44 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Sat, 5 Aug 2017 05:32:43 +0000 (05:32 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am:
8f54cd46ff
Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
TreeHugger Robot [Sat, 5 Aug 2017 05:20:42 +0000 (05:20 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 02:49:07 +0000 (02:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
26e4fda3f2 -s ours
Change-Id: I3a6622203e20263858b4d0e1d7fcd9233ad2c886
TreeHugger Robot [Sat, 5 Aug 2017 02:37:34 +0000 (02:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Meng Wang [Sat, 5 Aug 2017 00:04:43 +0000 (00:04 +0000)]
RadioInfo: fix OMADM buttons
am:
d4e0fe7f93
Change-Id: Ie7b00572102938fe64c2c6d2a6ce964c02bc493b
Bill Yi [Sat, 5 Aug 2017 00:04:36 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b239876604bd4f172b8b7af2e0d9307f6b2217d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Thu, 3 Aug 2017 17:54:48 +0000 (10:54 -0700)]
Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the
suggestions list should be done in the sublist instead of the original
list to maintain the list consistency check.
Hence, when dismissing the suggestion, change to remove the suggestion
from the sugestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.
Change-Id: I4caba74cfcc7bd0d53ad8c7dffcb127b3ebd845d
Merged-In: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
Fix:
64279080
Test: make RunSettingsRoboTests
Matthew Fritze [Tue, 1 Aug 2017 00:16:27 +0000 (17:16 -0700)]
Expose Location toggling logic
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug:
62022517
Change-Id: Ie6f4b7ce8a4024b86ba42971c5e3e24d1fd95ac6
Merged-In: I519fad6d802efd8af2e77c623f698e19d4cdc800
Meng Wang [Thu, 3 Aug 2017 21:34:35 +0000 (14:34 -0700)]
RadioInfo: fix OMADM buttons
1. Use activity context instead of application context to send broadcast
- the activity is in phone process
2. Fix the target receiver component name
3. Remove receiver permission restrict since it's explict broadcast
Bug:
37993019
Test: manual
Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2
Doris Ling [Thu, 3 Aug 2017 17:08:29 +0000 (17:08 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
am:
713e4f65bd
Change-Id: Ifc4750a60c72667e4611ab7c6fb0bb08b95b967f
Lei Yu [Thu, 3 Aug 2017 17:08:05 +0000 (17:08 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am:
2750dd8d6d
Change-Id: Ifdaaab5254e497839beb4c1eb749b310b5b512ae
Doris Ling [Thu, 3 Aug 2017 17:01:50 +0000 (17:01 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
Lei Yu [Thu, 3 Aug 2017 16:55:03 +0000 (16:55 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
Amit Mahajan [Thu, 3 Aug 2017 01:57:38 +0000 (01:57 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am:
d1c3bb1341
Change-Id: I693e64b11f9f4320d57749e35143d201fa3d23ca
TreeHugger Robot [Thu, 3 Aug 2017 01:46:21 +0000 (01:46 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
Doris Ling [Wed, 2 Aug 2017 22:21:50 +0000 (15:21 -0700)]
Make account preference icons bigger.
Use the regular preference layout for AccountTypePreference so that the
icon size will be the standard size.
Change-Id: I58a9e2d02b94f5abd9c8bb546f3d4e2984b3d6c6
Fix:
63660734
Test: visual
Bill Yi [Wed, 2 Aug 2017 22:12:38 +0000 (22:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
a3bdce963f -s ours
Change-Id: Ia5800ef75e332195d281d0b9f687bffb6ddcb16c
TreeHugger Robot [Wed, 2 Aug 2017 21:57:36 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Wed, 2 Aug 2017 20:50:24 +0000 (20:50 +0000)]
Style action bar during onResume instead of onCreate
am:
e156d9a59f
Change-Id: Iee729bda63cb9cf007754d1003fa02d755d5a771
Bill Yi [Wed, 2 Aug 2017 19:47:11 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Fan Zhang [Wed, 2 Aug 2017 17:47:37 +0000 (10:47 -0700)]
Style action bar during onResume instead of onCreate
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix:
64284689
Bug:
64297479
Test: robotests
jackqdyulei [Tue, 1 Aug 2017 17:45:41 +0000 (10:45 -0700)]
Turn on bluetooth anomaly detector
Since the related bug in battery stats is fixed, it is safe to
turn it on.
Also fix a bug in LocationCheckAction. In PermissionChecker we should
use permission name to check, not permission group name.
Bug:
64255601
Test: RunSettingsRoboTests
Change-Id: Ief8b5dc98f8a7ae462eb84936f6f61d626d7cddd
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
Andrew Sapperstein [Wed, 2 Aug 2017 06:07:23 +0000 (06:07 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am:
3daceaec5f
Change-Id: Ie4d946fb7ca1c018f8e1e5f3b54462f0e59041fa
TreeHugger Robot [Wed, 2 Aug 2017 06:02:29 +0000 (06:02 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
Daniel Nishi [Tue, 1 Aug 2017 23:18:57 +0000 (23:18 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am:
b27d65fa55
Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
Daniel Nishi [Tue, 1 Aug 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
Andrew Sapperstein [Sat, 29 Jul 2017 00:51:17 +0000 (17:51 -0700)]
Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.
Bug:
62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
Bill Yi [Tue, 1 Aug 2017 20:35:43 +0000 (20:35 +0000)]
Import translations. DO NOT MERGE
am:
b9fa3d1115 -s ours
Change-Id: I209e686f6bb1047fdc89e8d0103bb5ad7391f33f