Mark Salyzyn
159d5df6e5
Merge changes Ic198dc44,I15f000bf am: 682c2ede09 -s ours am: d3ad45e37c
...
am: a8e7eaafda
2016-08-05 17:31:57 +00:00
Mark Salyzyn
a8e7eaafda
Merge changes Ic198dc44,I15f000bf am: 682c2ede09 -s ours
...
am: d3ad45e37c
2016-08-05 17:29:00 +00:00
Mark Salyzyn
d3ad45e37c
Merge changes Ic198dc44,I15f000bf
...
am: 682c2ede09
2016-08-05 17:26:28 +00:00
Mark Salyzyn
682c2ede09
Merge changes Ic198dc44,I15f000bf
...
* changes:
select_logd_size_summaries char limit
select_logpersist_title char limit
2016-08-05 17:03:06 +00:00
Mark Salyzyn
f0b844cab1
select_logd_size_summaries char limit
...
increase select_logd_size_summaries character limit to 44
Bug: 29890579
Change-Id: Ic198dc4420e074fd72d1864c7448659a33126b1b
2016-08-05 09:31:09 -07:00
Mark Salyzyn
0e86d328d6
select_logpersist_title char limit
...
increase select_logpersist_title character limit to 60
increase select_logpersist_titles character limit to 26
Bug: 29313564
Change-Id: I15f000bf155f33a7d4a1cc6c5434552f43803f58
2016-08-05 09:31:04 -07:00
Doris Ling
d1d9fc9de8
Change Display->Ambient Display to Display->Quick screen check. am: b727e9caa5
...
am: 2533fb386d
2016-08-04 23:53:40 +00:00
Doris Ling
2533fb386d
Change Display->Ambient Display to Display->Quick screen check.
...
am: b727e9caa5
2016-08-04 23:46:47 +00:00
Doris Ling
b727e9caa5
Change Display->Ambient Display to Display->Quick screen check.
...
Update the preference title for Ambient display and add metrics logging
when user selects it.
Bug: 29994493
Change-Id: Ibeaa60889d3f4394c924471b21baa929d469db71
2016-08-04 13:06:22 -07:00
Bill Yi
83edf4d4d9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dfe576b3e4 -s ours
...
am: fd2baea4b8
2016-08-04 09:49:41 +00:00
Bill Yi
a48db7404a
Import translations. DO NOT MERGE am: 6daafd06a8 -s ours
...
am: a9ad38d3a5
2016-08-04 09:49:40 +00:00
Bill Yi
fd2baea4b8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: dfe576b3e4
2016-08-04 09:41:10 +00:00
Bill Yi
a9ad38d3a5
Import translations. DO NOT MERGE
...
am: 6daafd06a8
2016-08-04 09:41:09 +00:00
TreeHugger Robot
dfe576b3e4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-08-04 09:20:36 +00:00
Fan Zhang
8d76635318
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev am: e3f29e46b0
...
am: a539715ae0
2016-08-04 00:31:05 +00:00
Fan Zhang
eafaaf3922
Update summary correctly in Settings dashboard. am: 011362d9f1
...
am: 9ee547370b
2016-08-04 00:31:04 +00:00
Fan Zhang
a539715ae0
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
...
am: e3f29e46b0
2016-08-04 00:26:09 +00:00
Fan Zhang
9ee547370b
Update summary correctly in Settings dashboard.
...
am: 011362d9f1
2016-08-04 00:26:09 +00:00
TreeHugger Robot
e3f29e46b0
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
2016-08-04 00:18:44 +00:00
Bill Yi
6daafd06a8
Import translations. DO NOT MERGE
...
Change-Id: I823618147887ae9229f84bfb2be9b85babdfab0d
Auto-generated-cl: translation import
2016-08-03 16:08:38 -07:00
Fan Zhang
011362d9f1
Update summary correctly in Settings dashboard.
...
Bug: 30490325
SummaryLoader needs DashboardCategory to update summary and it currently
ask for it from DashboardAdapter. But DashboardCategory is not always
available in DashboardAdapter. When SummaryLoader wants to get category
from adapter before adapter is ready, it won't have it, causing summary
to appear blank sometimes.
The fix is to get category from data source directly.
Change-Id: I9d7f676954d1cece42d6e03748ab7aa35357f8b7
2016-08-03 15:50:39 -07:00
Fan Zhang
b2e240432c
Merge "Hide travel abroad button initially." into nyc-mr1-dev am: fa41bf14fc
...
am: b39fb89fe7
2016-08-03 22:21:15 +00:00
Fan Zhang
89156fe373
Hide travel abroad button initially. am: 79378ebf91
...
am: ca2b903bc1
2016-08-03 22:21:14 +00:00
Fan Zhang
b39fb89fe7
Merge "Hide travel abroad button initially." into nyc-mr1-dev
...
am: fa41bf14fc
2016-08-03 22:11:27 +00:00
Fan Zhang
ca2b903bc1
Hide travel abroad button initially.
...
am: 79378ebf91
2016-08-03 22:11:27 +00:00
Fan Zhang
fa41bf14fc
Merge "Hide travel abroad button initially." into nyc-mr1-dev
2016-08-03 21:59:07 +00:00
Fan Zhang
79378ebf91
Hide travel abroad button initially.
...
Bug: 30632031
This button needs to be initially hidden so user can't accidentally
click it before data is ready.
Change-Id: I8cdd1f68bdcb5ba7ecbde34e72d85a5da1fa4a3d
2016-08-03 12:58:07 -07:00
Jeremy Klein
2be1c4a08a
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev am: 84101bef07
...
am: 045d8f2326
2016-08-03 19:02:21 +00:00
Jeremy Klein
fc0b9c2f7e
Set the tether Entitlement app as active when enabling tethering. am: b04fae204e
...
am: 95fb3f6d3c
2016-08-03 19:02:20 +00:00
Jeremy Klein
045d8f2326
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev
...
am: 84101bef07
2016-08-03 18:59:43 +00:00
Jeremy Klein
95fb3f6d3c
Set the tether Entitlement app as active when enabling tethering.
...
am: b04fae204e
2016-08-03 18:59:42 +00:00
Jeremy Klein
84101bef07
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev
2016-08-03 18:54:12 +00:00
Tony Mak
5f36219b87
Merge "Hide redundant restrictions" into nyc-mr1-dev am: cd49847096
...
am: ff36f1784e
2016-08-03 09:38:58 +00:00
Tony Mak
3578d8f18c
Hide redundant restrictions am: 9ba765b875
...
am: 4de7f88830
2016-08-03 09:38:58 +00:00
Tony Mak
ff36f1784e
Merge "Hide redundant restrictions" into nyc-mr1-dev
...
am: cd49847096
2016-08-03 09:35:27 +00:00
Tony Mak
4de7f88830
Hide redundant restrictions
...
am: 9ba765b875
2016-08-03 09:35:27 +00:00
Tony Mak
cd49847096
Merge "Hide redundant restrictions" into nyc-mr1-dev
2016-08-03 09:28:25 +00:00
Jorim Jaggi
34ac13b754
Merge "Update string for FallbackHome" into nyc-mr1-dev am: 787fb603b9
...
am: d09a45a689
2016-08-03 00:53:30 +00:00
Jorim Jaggi
17b5675952
Update string for FallbackHome am: 2d3a1cd8bd
...
am: 626abf16f0
2016-08-03 00:53:30 +00:00
Jorim Jaggi
d09a45a689
Merge "Update string for FallbackHome" into nyc-mr1-dev
...
am: 787fb603b9
2016-08-03 00:50:58 +00:00
Jorim Jaggi
626abf16f0
Update string for FallbackHome
...
am: 2d3a1cd8bd
2016-08-03 00:50:57 +00:00
TreeHugger Robot
787fb603b9
Merge "Update string for FallbackHome" into nyc-mr1-dev
2016-08-03 00:43:24 +00:00
Erik Wolsheimer
a200a93196
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev
...
am: e6c1439ee4
2016-08-02 22:32:23 +00:00
Erik Wolsheimer
116a68e633
Fix potential NPE in BluetoothPairingDialog#onDestroy
...
am: 56c1b61e79
2016-08-02 22:32:23 +00:00
ewol
e6c1439ee4
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev
2016-08-02 22:29:35 +00:00
Jorim Jaggi
2d3a1cd8bd
Update string for FallbackHome
...
Also add some margins in case the string is really long
Change-Id: I0b5246d51d670316c8578475aedac00f8c090e57
Fixes: 30213213
2016-08-02 22:19:42 +02:00
Jorim Jaggi
2b97d4e087
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev am: 2b0bd66d5b
...
am: 70cb9bea74
2016-08-02 19:32:46 +00:00
Jorim Jaggi
4c839a59b3
Show progress user unlocking is delayed am: 984079442f
...
am: 30ac0e837a
2016-08-02 19:32:46 +00:00
Jorim Jaggi
70cb9bea74
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev
...
am: 2b0bd66d5b
2016-08-02 19:30:09 +00:00
Meng Wang
ced8b91c01
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev am: 6490032550
...
am: f9224775a6
2016-08-02 19:30:09 +00:00
