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
TreeHugger Robot
dd15ec98f8
Merge "Fixed storage used not updating when app disabled"
2016-08-03 23:14:24 +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
Bill Yi
50e65c5fa0
Import translations. DO NOT MERGE
...
Change-Id: Ib070e02b19bd7e195343ed491000f248efea7ce6
Auto-generated-cl: translation import
2016-08-03 16:00:44 -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
055c21ab56
Merge "Hide travel abroad button initially." into nyc-mr1-dev am: fa41bf14fc am: b39fb89fe7
...
am: b2e240432c
2016-08-03 22:23:31 +00:00
Fan Zhang
d36712b3c3
Hide travel abroad button initially. am: 79378ebf91 am: ca2b903bc1
...
am: 89156fe373
2016-08-03 22:23:31 +00: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
5d1557fc5b
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev am: 84101bef07 am: 045d8f2326
...
am: 2be1c4a08a
2016-08-03 19:20:14 +00:00
Jeremy Klein
381186d503
Set the tether Entitlement app as active when enabling tethering. am: b04fae204e am: 95fb3f6d3c
...
am: fc0b9c2f7e
2016-08-03 19:20:13 +00: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
Doris Ling
d26489e56c
Merge "Log settings suggestions events only once."
2016-08-03 17:22:24 +00:00
Tony Mak
c17d319f85
Merge "Hide redundant restrictions" into nyc-mr1-dev am: cd49847096 am: ff36f1784e
...
am: 5f36219b87
2016-08-03 09:54:24 +00:00
Tony Mak
53aded222c
Hide redundant restrictions am: 9ba765b875 am: 4de7f88830
...
am: 3578d8f18c
2016-08-03 09:54:23 +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
45b2c9d856
Merge "Update string for FallbackHome" into nyc-mr1-dev am: 787fb603b9 am: d09a45a689
...
am: 34ac13b754
2016-08-03 01:04:48 +00:00
Jorim Jaggi
c42dac79f4
Update string for FallbackHome am: 2d3a1cd8bd am: 626abf16f0
...
am: 17b5675952
2016-08-03 01:04:47 +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
Doris Ling
b14d42080b
Log settings suggestions events only once.
...
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes: 30108142
2016-08-02 17:01:39 -07:00
ewol
90c4e5f9dc
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev am: e6c1439ee4
...
am: a200a93196
2016-08-02 22:51:33 +00:00
Erik Wolsheimer
a91c223657
Fix potential NPE in BluetoothPairingDialog#onDestroy am: 56c1b61e79
...
am: 116a68e633
2016-08-02 22:51:32 +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
9e63415af6
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev am: 2b0bd66d5b am: 70cb9bea74
...
am: 2b97d4e087
2016-08-02 22:22:02 +00:00
Jorim Jaggi
bbf6e5e0c5
resolve merge conflicts of 4c839a5 to master
...
Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be
2016-08-02 22:26:55 +02: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
Meng Wang
7793bd41b7
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev am: 6490032550 am: f9224775a6
...
am: ced8b91c01
2016-08-02 19:44:13 +00:00
Meng Wang
ae45e82fa8
Hide sim card selection UI when only one sim presents am: dfba923468 am: ba61eb2d40
...
am: 11f5678daf
2016-08-02 19:44:13 +00: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
