OSDN Git Service
jackqdyulei [Mon, 28 Aug 2017 20:48:57 +0000 (20:48 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev am:
ccbb613fa9
am:
f54f8e3d5a
Change-Id: I3f98fe4eb71d456b188d8bfa48c64f6bc3bb2f26
jackqdyulei [Mon, 28 Aug 2017 20:16:04 +0000 (20:16 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
am:
ccbb613fa9
Change-Id: I7307cbd56949ea995906cc47f67afa660f50d0a0
TreeHugger Robot [Mon, 28 Aug 2017 19:55:39 +0000 (19:55 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
Lei Yu [Mon, 28 Aug 2017 17:50:33 +0000 (17:50 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev am:
088393596e
am:
3f1dfc21ec
Change-Id: Ica312c451476d5e0180e94f8b7f04d5848b19db3
Lei Yu [Mon, 28 Aug 2017 17:45:38 +0000 (17:45 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
am:
088393596e
Change-Id: I93f50785f54b1287167f1f87c91167365b295a64
Lei Yu [Mon, 28 Aug 2017 17:35:59 +0000 (17:35 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
* changes:
Add functional test for wakelock anomaly detector
Add functional test for bt anomaly detector
Jack He [Sat, 26 Aug 2017 03:03:03 +0000 (03:03 +0000)]
Bluetooth: Only show devices when their names are resolved am:
19ba320263
am:
7a6aadce4b
Change-Id: I93ab225467dfbb51c77ea9dfde0e3082a845624c
Jack He [Sat, 26 Aug 2017 02:51:48 +0000 (02:51 +0000)]
Bluetooth: Only show devices when their names are resolved
am:
19ba320263
Change-Id: I23300ac9541f88b3aeb978be0771e93b85fe834f
Jack He [Thu, 1 Jun 2017 01:37:28 +0000 (18:37 -0700)]
Bluetooth: Only show devices when their names are resolved
* Add a developer menu option to allow name-less devices to be shown
when a Bluetooth developer needs it, but hide it for non-developer
users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
does not have a name besides MAC address and the above developer option
is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
not affect BluetoothSettings. BluetoothSettings will show all paired
devices regardless whether an user friendly name exists.
Bug:
34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5
jackqdyulei [Fri, 25 Aug 2017 21:37:39 +0000 (14:37 -0700)]
Remove subtitle for Recent location apps
Bug:
65011654
Test: Screenshot
Change-Id: I840e6ee8f755b4bbb5392a80224dc5b4b19a8054
jackqdyulei [Thu, 17 Aug 2017 22:06:06 +0000 (15:06 -0700)]
Add functional test for wakelock anomaly detector
Bug:
63815938
Test: runtest -x WakelockAnomalyTest
Change-Id: I4d10d5be8b38264f29c67c2c945fdbbd1090430d
jackqdyulei [Thu, 17 Aug 2017 21:26:01 +0000 (14:26 -0700)]
Add functional test for bt anomaly detector
This cl:
Set up the environment for functional test
1. Update Android.mk by adding instrumentation and libs
2. Update AndroidManifest.xml by adding runner
Add functional test for bt anomaly, with the following workflow
1. reset battery stats
2. pretend unplug and screen off
3. Start AnomalyTester app, set values and click start button
4. Wait its running
5. Check anomaly preference in battery main page
6. reset all parameters
Bug:
63815938
Test: runtest -x BluetoothAnomalyTest
Change-Id: Ief02a314d21f6c32d70729047a1d4bdce9ad9920
jackqdyulei [Fri, 25 Aug 2017 18:50:54 +0000 (18:50 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev am:
77bd8c3a73
am:
c26876ade7 -s ours
Change-Id: I770e50ee18b8aa387fd3bcede93a10ba7922ae6b
jackqdyulei [Fri, 25 Aug 2017 18:37:53 +0000 (18:37 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am:
77bd8c3a73
Change-Id: I36f5729dd042c88c9f8d6a2d4abf720a05748246
TreeHugger Robot [Fri, 25 Aug 2017 18:25:03 +0000 (18:25 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
Daniel Nishi [Fri, 25 Aug 2017 17:19:00 +0000 (17:19 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev am:
2b53a8467c
am:
f2094821e8
Change-Id: I5204fbf3771778cb0597e8ad6d493b0a0645511c
Daniel Nishi [Fri, 25 Aug 2017 17:09:52 +0000 (17:09 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev
am:
2b53a8467c
Change-Id: I698897d5c21decadfaf437880a81e754939df850
Daniel Nishi [Fri, 25 Aug 2017 16:51:45 +0000 (16:51 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 03:48:50 +0000 (03:48 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev am:
08fecc4143
am:
6896e1ef05
Change-Id: I55f427850f7d1accda9594ca2b20cf97d4937be0
Doris Ling [Fri, 25 Aug 2017 03:48:07 +0000 (03:48 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev am:
51c83353fe
am:
e80bb0d5ce
Change-Id: Id3de7150516804bc7a08c665943769c27173fc9a
jackqdyulei [Fri, 25 Aug 2017 03:44:25 +0000 (03:44 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev
am:
08fecc4143
Change-Id: Id3125640f4d62da1161b9e894577c6285fe7c83a
Doris Ling [Fri, 25 Aug 2017 03:43:37 +0000 (03:43 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
am:
51c83353fe
Change-Id: I869238f4c9198dbd167ab02d18e41e0e67001c38
TreeHugger Robot [Fri, 25 Aug 2017 03:35:46 +0000 (03:35 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 03:34:34 +0000 (03:34 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 01:53:28 +0000 (01:53 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev am:
4aaacaf7e3
am:
d52c9708b5
Change-Id: I5122c905e3227b5fb26286a87bbf879a0fce9fb1
jackqdyulei [Fri, 25 Aug 2017 01:49:28 +0000 (01:49 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
am:
4aaacaf7e3
Change-Id: Icc5588c0fde97908d371452c622980fddae054df
TreeHugger Robot [Fri, 25 Aug 2017 01:38:53 +0000 (01:38 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
Sundeep Ghuman [Fri, 25 Aug 2017 00:57:11 +0000 (00:57 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev am:
a253e1d416
am:
501975914c
Change-Id: Ic3489f58b427ee0be5b3ad39a801af02ec15835b
Sundeep Ghuman [Fri, 25 Aug 2017 00:38:58 +0000 (00:38 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
am:
a253e1d416
Change-Id: I4309bdd864d7da5a0b33e744d28feafe9966012b
Maurice Lam [Fri, 25 Aug 2017 00:31:02 +0000 (00:31 +0000)]
Merge "Fix typo in fingerprint string"
TreeHugger Robot [Fri, 25 Aug 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
jackqdyulei [Wed, 9 Aug 2017 16:57:27 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.
If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.
Bug:
63393322
Test: RunSettingsRoboTests
Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Merged-In: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Lei Yu [Thu, 24 Aug 2017 23:39:35 +0000 (23:39 +0000)]
Merge "Add battery indicator to bluetooth icon"
jackqdyulei [Wed, 16 Aug 2017 00:02:58 +0000 (17:02 -0700)]
Add wakelock action in testing app
This cl adds action to hold the wakelock for specific time. With
this action we could test whether wakelock detector is effective.
Bug:
2731722
Test: make -j40 AnomalyTester
Change-Id: I1d44c12363f126ea9b8fc44f4c135e46b898186c
jackqdyulei [Tue, 15 Aug 2017 17:12:14 +0000 (10:12 -0700)]
Add bt anomaly action in testing app
This cl adds the action to start bluttooth unoptimized scanning.
With this action we could test whether bt anomaly detector is
effective.
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I7f41dbb07384fbf3c5a81e460a3629306bc33f59
Daniel Nishi [Thu, 24 Aug 2017 22:15:39 +0000 (22:15 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev am:
efcc8be05c
am:
5f97c05f1c
Change-Id: I46c4a921a25ef17197e90038ff71a982a192aae7
Daniel Nishi [Thu, 24 Aug 2017 21:24:31 +0000 (21:24 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am:
efcc8be05c
Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321
Doris Ling [Thu, 24 Aug 2017 20:09:57 +0000 (13:09 -0700)]
Fix jank in showing conditions and suggestions in cold start.
When we first initialize the dashboard view, and register the condition
listener, it will trigger the condition changed callback immediately.
This results in unnecessary refresh of the dashboard header. Add check
to not do the refresh when we first initialize the view.
Change-Id: If7c69637463734c150b7f5eb7f3c042cf73837fa
Fixes:
64811475
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 9 Aug 2017 16:57:27 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.
If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.
Bug:
63393322
Test: RunSettingsRoboTests
Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Maurice Lam [Thu, 24 Aug 2017 19:39:38 +0000 (12:39 -0700)]
Fix typo in fingerprint string
Test: Manual
Bug:
65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674
TreeHugger Robot [Thu, 24 Aug 2017 19:27:23 +0000 (19:27 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
Roozbeh Pournader [Thu, 24 Aug 2017 19:24:01 +0000 (19:24 +0000)]
Merge "Use fallback linespacing in ChartSweepView and ChartGridView"
Lei Yu [Thu, 24 Aug 2017 17:46:29 +0000 (17:46 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev am:
3949ed53a9
am:
a9eb0eb4bc
Change-Id: Ia427fdbec8afce9aa0133e182bde39757345e132
Lei Yu [Thu, 24 Aug 2017 17:45:52 +0000 (17:45 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev am:
8cac6b07bc
am:
c564686ec8
Change-Id: Id6c2f70cd547fad814e2bbf344f9e8d64fc8f64d
Lei Yu [Thu, 24 Aug 2017 17:42:09 +0000 (17:42 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
am:
3949ed53a9
Change-Id: I2cfae5ecff424ff042e0a0b29a610908563b8348
Lei Yu [Thu, 24 Aug 2017 17:41:25 +0000 (17:41 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev
am:
8cac6b07bc
Change-Id: I5be8aab32f4918814ab2273f608b38d4403b24d0
Lei Yu [Thu, 24 Aug 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
Lei Yu [Thu, 24 Aug 2017 17:34:56 +0000 (17:34 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 08:33:50 +0000 (08:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
8dce5e57c3 -s ours
am:
ac57de36da -s ours
Change-Id: Iba539724df718bca825ce46cee030ea8064bd217
Bill Yi [Thu, 24 Aug 2017 08:07:20 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
8dce5e57c3 -s ours
Change-Id: I3b749db0e748344dad59f8d9487525320f516bb2
TreeHugger Robot [Thu, 24 Aug 2017 07:49:30 +0000 (07:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 07:45:49 +0000 (07:45 +0000)]
Merge "Import translations. DO NOT MERGE am:
683fdb8177 -s ours am:
1d339fab5f -s ours" into oc-mr1-dev-plus-aosp
am:
9b1ff6ca9d -s ours
Change-Id: I5a0a51ad0e6d581293ef90363c13bb325f9e64a3
Bill Yi [Thu, 24 Aug 2017 07:45:12 +0000 (07:45 +0000)]
Import translations. DO NOT MERGE am:
683fdb8177 -s ours am:
89ebaf6c52 -s ours
am:
82446dc8a7 -s ours
Change-Id: I52855274f49bcad4141468c296b36ce1b62c0bcc
Android Build Merger (Role) [Thu, 24 Aug 2017 07:41:50 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE am:
683fdb8177 -s ours am:
1d339fab5f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 07:41:13 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE am:
683fdb8177 -s ours
am:
1d339fab5f -s ours
Change-Id: Ifce1308a8c9524b7ed12037f7c4912b6991c168e
Bill Yi [Thu, 24 Aug 2017 07:41:12 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE am:
683fdb8177 -s ours
am:
89ebaf6c52 -s ours
Change-Id: I2e80906f9c3d4657e9dc1d5dd8aef36f4ce19235
Bill Yi [Thu, 24 Aug 2017 07:37:10 +0000 (07:37 +0000)]
Import translations. DO NOT MERGE
am:
683fdb8177 -s ours
Change-Id: I6d6c17a868765261ace38e0532c95695c2dfb840
Bill Yi [Thu, 24 Aug 2017 07:37:10 +0000 (07:37 +0000)]
Import translations. DO NOT MERGE
am:
683fdb8177 -s ours
Change-Id: I5b3d3ae77cbda9a3badd40e678034f4ee157b7be
TreeHugger Robot [Thu, 24 Aug 2017 07:27:37 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 24 Aug 2017 05:15:37 +0000 (22:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I452434cbf7282ba20233b9345b75ebdf9251ef98
Bill Yi [Thu, 24 Aug 2017 04:58:28 +0000 (21:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I5ac7b8c39cb58c662a744ac1c0608ed901fb670e
Bill Yi [Thu, 24 Aug 2017 04:40:56 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2c072d206c99da9b6fc821012a7a4056020aaaf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Soroosh Mariooryad [Thu, 24 Aug 2017 04:32:47 +0000 (04:32 +0000)]
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev am:
f83b94aa0c
am:
4e4d3631fc
Change-Id: I5207a13fa2997cad393ec60d5f0cfb93eecbde16
Soroosh Mariooryad [Thu, 24 Aug 2017 04:20:30 +0000 (04:20 +0000)]
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am:
f83b94aa0c
Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c
TreeHugger Robot [Thu, 24 Aug 2017 04:11:48 +0000 (04:11 +0000)]
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
Stephen Chen [Thu, 24 Aug 2017 02:17:10 +0000 (02:17 +0000)]
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev am:
a78eeb2d61
am:
31deb9a766
Change-Id: Ibd4f9959af5c5c1bde51ce1b9285531880301daa
Stephen Chen [Thu, 24 Aug 2017 01:58:48 +0000 (01:58 +0000)]
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
am:
a78eeb2d61
Change-Id: Ide908ed189c110c272cd5535f9fbc99705b8555a
TreeHugger Robot [Thu, 24 Aug 2017 01:43:58 +0000 (01:43 +0000)]
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
Doris Ling [Thu, 24 Aug 2017 01:11:22 +0000 (01:11 +0000)]
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev am:
d94fbbc325
am:
c2eab36c7c
Change-Id: I09efabd3f8a4a7358f2b6a6d52a15fdd75ca7672
Doris Ling [Thu, 24 Aug 2017 00:48:20 +0000 (00:48 +0000)]
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
am:
d94fbbc325
Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
jackqdyulei [Mon, 14 Aug 2017 23:24:50 +0000 (16:24 -0700)]
Add UI components for bluetooth anomaly
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I4584e6ada784d8d87558a5b30cf55e2de33d443a
TreeHugger Robot [Thu, 24 Aug 2017 00:36:43 +0000 (00:36 +0000)]
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
jackqdyulei [Mon, 14 Aug 2017 20:54:22 +0000 (13:54 -0700)]
Set up anomaly test app in settings
This cl set up the basic android framework for anomly test app.
Anomaly test app has the similar architecture compared with
settings api tester.
1. Add Android.mk and AndroidManifest.xml
2. Add blank AnomalyActivity
3. Add related resource files.
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I1d59517c9c2d8d0b8e219e3a67dfae73ca5a968e
jackqdyulei [Wed, 23 Aug 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Set preference invisible when no anomaly" into oc-mr1-dev am:
0e800978bf
am:
fb13cac59f
Change-Id: I9a851fc886abb1489b8133468aed2c0548ffbd2d
jackqdyulei [Wed, 23 Aug 2017 20:15:19 +0000 (20:15 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev am:
d0066e3875
am:
02e4c7d809
Change-Id: I031e65952befe7507ce09701af02e1131fe278cf
jackqdyulei [Wed, 23 Aug 2017 20:11:28 +0000 (20:11 +0000)]
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
am:
0e800978bf
Change-Id: Icf0931c60d62fd9e18bc3cfe2853e965403e7740
jackqdyulei [Wed, 23 Aug 2017 20:01:51 +0000 (20:01 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
am:
d0066e3875
Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
TreeHugger Robot [Wed, 23 Aug 2017 19:57:41 +0000 (19:57 +0000)]
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:38:40 +0000 (19:38 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:12:04 +0000 (19:12 +0000)]
Merge "Fix to show correct value for data limit setting"
jackqdyulei [Tue, 15 Aug 2017 18:01:07 +0000 (11:01 -0700)]
Set preference invisible when no anomaly
In the previous code path, we will create an invisible anomaly preference
and update it to visible if it contains any anomaly. However, when
anomaly is dismissed we don't reset preference to invisible.
So, this cl adds code to set it to invisible explicitly when anomaly list
is empty.
Bug:
64617126
Test: RunSettingsRoboTests
Change-Id: Ie7a3498da91243f05f4c47fb1cc5f67b177d04b1
jackqdyulei [Wed, 23 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev am:
a097d68c4b
am:
92597b0e26
Change-Id: I68323c887d22b0f0df9801adcba436629503270b
Kevin Chyn [Wed, 23 Aug 2017 03:52:09 +0000 (03:52 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev am:
a6b67d15eb
am:
d328b9051c
Change-Id: Ie2d3605d0cf6d8057981d48bdabb0e67645e0a34
Amit Mahajan [Wed, 23 Aug 2017 03:51:20 +0000 (03:51 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422 am:
f70f53473a am:
4bb56f5282
am:
6afddc2308
Change-Id: I8ca45f06f6c37a7deadf4dbc91f0e4bc06ba04c9
jackqdyulei [Wed, 23 Aug 2017 02:06:12 +0000 (02:06 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
am:
a097d68c4b
Change-Id: Ib020db1315c7e16f86bc076859187f75d79c87ee
Kevin Chyn [Wed, 23 Aug 2017 01:43:12 +0000 (01:43 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
am:
a6b67d15eb
Change-Id: Icb5ec09a66aadf48a81f33d57aacbb52d05f9c2f
TreeHugger Robot [Wed, 23 Aug 2017 01:42:42 +0000 (01:42 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
Steven Timotius [Wed, 23 Aug 2017 00:47:12 +0000 (17:47 -0700)]
Fix to show correct value for data limit setting
Bug:
64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
TreeHugger Robot [Wed, 23 Aug 2017 00:47:03 +0000 (00:47 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837 am:
a81a339c1d -s ours am:
a211db7af3
am:
1c7988b11b
Change-Id: I096036c643f417655b98283371acafeab43bd25f
TreeHugger Robot [Wed, 23 Aug 2017 00:24:13 +0000 (00:24 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
Roozbeh Pournader [Tue, 22 Aug 2017 23:54:27 +0000 (16:54 -0700)]
Use fallback linespacing in ChartSweepView and ChartGridView
Bug:
28963299
Test: none
Change-Id: I249a3795fcbfbef14eac11b72220bb92f9690de6
Amit Mahajan [Wed, 23 Aug 2017 00:07:47 +0000 (00:07 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422 am:
f70f53473a
am:
4bb56f5282
Change-Id: I1862129b9ec0e2c20981586cf29c672f30c2912f
TreeHugger Robot [Tue, 22 Aug 2017 23:48:07 +0000 (23:48 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837 am:
a81a339c1d -s ours
am:
a211db7af3
Change-Id: Icf1a718d443c1f72d1ddcd35c565fd0afa6c6222
Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422
am:
f70f53473a
Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db
TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837
am:
a81a339c1d -s ours
Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a
Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052
am:
b2498bc422
Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac
Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
am:
54eeafa052
Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb
am:
b87acf6837
Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]
Merge changes from topic "Read dun APNs from apn db"
am:
f9390ce1fb
Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
OSDN Git Service
